Commit graph

64828 commits

Author SHA1 Message Date
Treehugger Robot
bf426993db Merge "liblog: add unistd.h to vndk log/log.h" 2020-10-05 21:14:13 +00:00
Tom Cherry
c1fe112b9d Merge "Revert "Remove logging symlinks from system/core/include"" am: c274f9ff69
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1449381

Change-Id: Ic04ff0477b8fe8cfbc14019eac7f6001cae7f62b
2020-10-05 19:54:26 +00:00
Christopher Ferris
27dcf97048 Merge "libunwindstack: Support signal frame CIEs." am: f30b12e6ad
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1443619

Change-Id: I1377383ec5e926ec430711c6e06489d92affd66a
2020-10-05 19:54:11 +00:00
Tom Cherry
c274f9ff69 Merge "Revert "Remove logging symlinks from system/core/include"" 2020-10-05 19:26:17 +00:00
Christopher Ferris
f30b12e6ad Merge "libunwindstack: Support signal frame CIEs." 2020-10-05 19:25:01 +00:00
Tom Cherry
f94b88fa61 Revert "Remove logging symlinks from system/core/include"
Revert "Include system/core/liblog/include instead of using symlinks"

Revert submission 1428983-no-log-header-symlinks

Reason for revert: Build breaks
Reverted Changes:
I248a2f045:Include system/core/liblog/include instead of usin...
Ic189e0f59:Remove logging symlinks from system/core/include

Change-Id: Ia7d9efb29a5e83bb5d7c0e4a73f40c72c719bc62
2020-10-05 19:24:12 +00:00
Tom Cherry
136e4f6da6 liblog: add unistd.h to vndk log/log.h
Too many vendors assume that this is included, and it's not worth the
effort to clean up.

Bug: 165825252
Test: build
Change-Id: I42fb32be7e5e3201dfc5c58734e3ef5b9251faf1
2020-10-05 12:19:15 -07:00
Mohammad Islam
681794c70e Merge "Activate encryption for /data/app-staging folder" am: f99f09eeda
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1435397

Change-Id: If25e0952c877119dcbbb3e2bc7213e0b13dd32c9
2020-10-05 17:36:37 +00:00
Tom Cherry
74950cf881 Merge "Remove logging symlinks from system/core/include" am: f8a89dc3a2
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1428983

Change-Id: Id0572b00c9f556846c51d8f8ff14ce04e7c7878f
2020-10-05 17:35:57 +00:00
Tom Cherry
4f6b65b4f0 Merge "Delete include/private/android_filesystem_config.h" am: 351586822f
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1430210

Change-Id: Idf074df8ad9c0d3289df54e8e947cb6b67d089fa
2020-10-05 17:35:25 +00:00
Mohammad Islam
f99f09eeda Merge "Activate encryption for /data/app-staging folder" 2020-10-05 16:01:59 +00:00
Tom Cherry
f8a89dc3a2 Merge "Remove logging symlinks from system/core/include" 2020-10-05 15:26:51 +00:00
Tom Cherry
351586822f Merge "Delete include/private/android_filesystem_config.h" 2020-10-05 15:26:32 +00:00
Tom Cherry
167fbf534b Delete include/private/android_filesystem_config.h
This header should be accessed through libcutils.

Test: build
Change-Id: Ifb0ad3bc63ec5806d9c474a5d39721b2189c34de
2020-10-05 15:26:24 +00:00
Joseph Jang
2cfa8fd91c Merge "fastboot: add new oem command for post wipe userdata" am: 012ee0ae0a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1429852

Change-Id: I8934d5272bf72f6db2d900f61d30768df1a30639
2020-10-05 02:53:10 +00:00
Joseph Jang
012ee0ae0a Merge "fastboot: add new oem command for post wipe userdata" 2020-10-05 02:34:52 +00:00
Tianjie Xu
d708fae58e Merge changes from topic "revert-1433573-vab-libsnapshot-linkage-APIHERUSEB" am: 216ce0985f
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1447800

Change-Id: I90e875ca207564bc1b21824858c68a9a8a06afed
2020-10-03 20:11:20 +00:00
Tianjie Xu
62d6fdc11a Revert "libsnapshot: Implement OnlineKernelSnapshotWriter::OpenReader." am: ad583f2a16
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1447798

Change-Id: I69698f7c9e6fdb50c011989d88aa0485e641d0e9
2020-10-03 20:11:09 +00:00
Tianjie Xu
216ce0985f Merge changes from topic "revert-1433573-vab-libsnapshot-linkage-APIHERUSEB"
* changes:
  Revert "libsnapshot: Partially implement OpenSnapshotWriter."
  Revert "libsnapshot: Implement OnlineKernelSnapshotWriter::OpenReader."
2020-10-03 19:27:32 +00:00
Tianjie Xu
5aa52d91dd Revert "libsnapshot: Partially implement OpenSnapshotWriter."
Revert "Link to libsnapshot_cow everywhere libsnapshot is linked."

Revert submission 1433573-vab-libsnapshot-linkage

Reason for revert: b/169981170, update crash for droidfooders.
Reverted Changes:
Ie75bba98c:Link to libsnapshot_cow where libsnapshot is linke...
Ieedfadc55:libsnapshot: Partially implement OpenSnapshotWrite...
I28a5d4a88:Link to libsnapshot_cow everywhere libsnapshot is ...

Exempt-From-Owner-Approval: Revert to unblock dogfood
Change-Id: I0677df77672aca9fd54d94e009ac0be7c88a1a9d
2020-10-03 19:26:18 +00:00
Tianjie Xu
ad583f2a16 Revert "libsnapshot: Implement OnlineKernelSnapshotWriter::OpenReader."
This reverts commit 39f250896a.

Reason for revert: b/169981170, update crash for droidfooders.

Change-Id: I6a3d096df3174596d36195bf59fa8fbc88c982d0
2020-10-03 07:26:29 +00:00
Wenhao Wang
52aa2334a7 Merge "rpmb_dev: Fix RPMB_REQ_DATA_READ command" am: a560b76faa
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1446625

Change-Id: Id1c3998a3ae09ff1a5cd4da4b6387d49b5beb747
2020-10-03 05:19:08 +00:00
Wenhao Wang
a560b76faa Merge "rpmb_dev: Fix RPMB_REQ_DATA_READ command" 2020-10-03 05:11:27 +00:00
Arve Hjønnevåg
fe090a4686 trusty: keymaster: set_attestation_key: Change wrapped key
Remove WrappedPrivateKey and select wrapped vs plaintext key command
based on format instead.

Bug: 154033394
Test: send wrapped test key. Not yet accepted by trusty
Change-Id: I3b0a29be78f2a8e84ebd990713f66788256d8e3f
2020-10-02 16:55:16 -07:00
Ryan Prichard
9b8f545920 libunwindstack: Support signal frame CIEs.
Mark a CIE with a S in its augmentation string as signal frame.
This allows the code to properly handle signal frame data if none
of the signal frame pattern matchers work.

For a signal frame, DwarfSectionImpl<AddressType>::Eval needs to
continue the unwinding even if PC is zero. A zero PC means that the
program has crashed, and we should try to recover the real PC using the
return address on the stack or LR. This behavior is tested by
UnwindOffline.signal_{x86,x86_64}, which modify the libc.so files
so that the signal frame pattern matcher fails and the CIE/FDE
data is used instead.

Test: libunwindstack_test
Change-Id: I4655b070028fd984345311a5e743796f8c30ed36
2020-10-02 16:34:14 -07:00
Steven Moreland
967bacd0dd Merge "Adds license header" am: 754c6b2924
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1446918

Change-Id: Ibed5835575417218a4ac3f51b8576b42a24334df
2020-10-02 21:04:33 +00:00
Akilesh Kailash
ca5c44a4ba Merge "libcutils_static: Make ramdisk available for snapuserd daemon" am: ecfbd8ef09
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1440765

Change-Id: I3cb9749687cfaf60796bc519a5ef9a99f5d2d510
2020-10-02 21:04:04 +00:00
Akilesh Kailash
47014a7514 Merge "libsnapshot:snapuserd: Transitions for snapuserd" am: e19df50b75
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1437277

Change-Id: I50d4f6d0bc2ad83cf7c8782df637ce027206dabd
2020-10-02 21:03:52 +00:00
Steven Moreland
754c6b2924 Merge "Adds license header" 2020-10-02 20:32:31 +00:00
Akilesh Kailash
ecfbd8ef09 Merge "libcutils_static: Make ramdisk available for snapuserd daemon" 2020-10-02 20:20:43 +00:00
Akilesh Kailash
e19df50b75 Merge "libsnapshot:snapuserd: Transitions for snapuserd" 2020-10-02 20:20:43 +00:00
Wenhao Wang
62855c3985 rpmb_dev: Switch to RPMB provisioning scheme
Remove the --key option part to disable the initial setting of rpmb key
on the mock rpmb device.
The RPMB provisioning scheme will program the RPMB key into the mock
rpmb device.

Bug: 152901318
Test: Trusty storage tests
Change-Id: I03b9cfbbd10e2e5364405319a57e2ecc4ee0f48e
2020-10-02 12:39:30 -07:00
Wenhao Wang
975491be09 rpmb_dev: Fix RPMB_REQ_DATA_READ command
Add ".check_key_programmed = true." for RPMB_REQ_DATA_READ such that
we can check whether the rpmb key has been programmed before executing
RPMB_REQ_DATA_READ command.

"JEDEC STANDARD Universal Flash Storage (UFS) Version 3.0" specifies
that data access before the key has been programmed should return
“Authentication Key not yet programmed” (0007h)..

Bug: 152901318
Test: Trusty storage tests
Change-Id: I4759fbce5f37234090a22a1d9dc3b38072f6ecaf
2020-10-02 12:32:30 -07:00
Akilesh Kailash
01085dc1b4 libsnapshot:snapuserd: Transitions for snapuserd
1: Create a static library which exposes APIs
to manage snapuserd daemon.

2: Snapuserd daemon creates communication socket.

Bug: 168258493
Test: cow_snapuserd_test tests all the library API
along with the IO path from dm-snapshot.

Signed-off-by: Akilesh Kailash <akailash@google.com>
Change-Id: I8aaedf89d75e793c145fdad248a4d88e0ce8348c
2020-10-02 18:41:11 +00:00
Dylan Katz
50ed92a7e0 Adds license header
Missed a review point made, added the license header to FuzzFormatTypes
Test: Compiled code

Signed-off-by: Dylan Katz <dylan.katz@leviathansecurity.com>
Change-Id: Ib8f32b802ec207d0483772c38a0a741e0dd1f151
2020-10-02 11:08:15 -07:00
Akilesh Kailash
dfb1e08ab3 libcutils_static: Make ramdisk available for snapuserd daemon
Bug: 168258493
Test: cow_snapuserd_test
Signed-off-by: Akilesh Kailash <akailash@google.com>
Change-Id: I0fef4009e86ee93b7c2a752c7dba43914342d943
2020-10-02 15:49:16 +00:00
Christopher Ferris
fd43e423b7 Merge "Fix an error when overflows occur." am: 483364a7ec
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1446118

Change-Id: If9b85c1c1a316b18af92b23fca2ffd0c14f7eb6a
2020-10-02 08:03:23 +00:00
Christopher Ferris
483364a7ec Merge "Fix an error when overflows occur." 2020-10-02 07:51:20 +00:00
Christopher Ferris
9b6abd50d8 Fix an error when overflows occur.
Bug: 169657723

Test: Ran original test case and verified it does not leak.
Change-Id: I7a315bc3a2c380c207696ce06cc4aeb5b27937ac
2020-10-01 18:40:44 -07:00
Treehugger Robot
8819b90d32 Merge "Start tombstoned early in post-fs-data." am: 77dfd99beb
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1445776

Change-Id: I8804b3b51898c334a4c5d40db8e360d384b6710b
2020-10-02 01:30:07 +00:00
Treehugger Robot
77dfd99beb Merge "Start tombstoned early in post-fs-data." 2020-10-02 01:20:35 +00:00
Josh Gao
81c94cdce6 Start tombstoned early in post-fs-data.
Bug: http://b/169659307
Test: manual
Change-Id: Ie19de31e7e2b6cd43402cfd3a2e9274728e9e6b4
2020-10-01 14:25:36 -07:00
Treehugger Robot
c950673062 Merge "Improve error message in debuggerd fallback handler." am: d0642a373d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1439573

Change-Id: I1e4c6ac7e23c9b590242767c6b2252404d3149f5
2020-10-01 21:12:50 +00:00
Treehugger Robot
d0642a373d Merge "Improve error message in debuggerd fallback handler." 2020-10-01 21:00:16 +00:00
Tom Cherry
6ac7f00e2b Merge "init: guarantee the ordering that actions are executed in" am: 7cfc944195
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1444495

Change-Id: I14e6e53ddf4674a50dee1f3c8ca320b65a0d519a
2020-10-01 20:42:02 +00:00
Tom Cherry
7cfc944195 Merge "init: guarantee the ordering that actions are executed in" 2020-10-01 20:27:40 +00:00
Tom Cherry
b48cfffa61 Merge "logd: drop logs about pruning and compression to VERBOSE" am: 8ba33eb34b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1440264

Change-Id: I5cdac4ac3d3ab4171c890a544c93a0b8437ad667
2020-10-01 18:19:08 +00:00
Tom Cherry
34ee04762a init: guarantee the ordering that actions are executed in
The README.md states that this ordering is not guaranteed to give
flexibility for the future, however it's time to state that this
ordering is guaranteed, especially since:

1) We have a tests, EventTriggerOrder and
   EventTriggerOrderMultipleFiles, which have guaranteed this ordering
   since 2017.
2) We have users requesting and depending on this order

Also update some slightly out of date parts of the documentation:
1) We import /system/etc/init/hw/init.rc instead of /init.rc as the
   first import
2) We additionally import /system_ext/etc/init and /product/etc/init

Test: n/a
Change-Id: I6d7b8d9e52f0d52bee320d5074ebb74a537f9150
2020-10-01 11:07:43 -07:00
Tom Cherry
8ba33eb34b Merge "logd: drop logs about pruning and compression to VERBOSE" 2020-10-01 17:22:47 +00:00
josephjang
2906975399 fastboot: add new oem command for post wipe userdata
When Android userdata partition has been erased in fastbootd, call
oem specific API doOemSpecificErase() to wipe other userdata in
device.

If oem doesn't implement this specific API in fastboot_hal lib,
fastbootd will receive 'NOT_SUPPORTED' return status.

Bug: 169173873
Change-Id: I9b6a5a4aaed31d1168e633418b189f9bb6d34d01
2020-10-01 05:09:26 +00:00