Arve Hjønnevåg
89fe40b5c0
Merge "trusty: keymaster: set_attestation_key: Change wrapped key" am: 3e7c3504a3 am: 397e40b158
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1446633
Change-Id: Id105ddfa71ada179b458c2e200e1de4439057cb7
2020-10-07 00:08:34 +00:00
Arve Hjønnevåg
397e40b158
Merge "trusty: keymaster: set_attestation_key: Change wrapped key" am: 3e7c3504a3
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1446633
Change-Id: I44fd518b31ede08ebf01628d2252dd11c0bc57d7
2020-10-06 23:51:54 +00:00
Arve Hjønnevåg
3e7c3504a3
Merge "trusty: keymaster: set_attestation_key: Change wrapped key"
2020-10-06 23:31:38 +00:00
Xin Li
65c6d185d8
Merge "DO NOT MERGE - Merge RP1A.201005.006" am: 9602e3d31a am: 8c42a18cf8
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1449500
Change-Id: I48a6184d63d99b754d0c55dc1d52ca3f6bbf41e6
2020-10-06 21:15:48 +00:00
The Android Open Source Project
b39e14e6bc
DO NOT MERGE - Merge RP1A.201005.006 am: 7fd5f8d2bc am: 1a016c3af8
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1449500
Change-Id: Ib33a329d3d44efd346b02e3e4022a0f9e69cc7aa
2020-10-06 21:15:42 +00:00
Xin Li
8c42a18cf8
Merge "DO NOT MERGE - Merge RP1A.201005.006" am: 9602e3d31a
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1449500
Change-Id: I8b43f619590b1076e7a6973c9a5a6974568f25f9
2020-10-06 20:24:10 +00:00
The Android Open Source Project
1a016c3af8
DO NOT MERGE - Merge RP1A.201005.006 am: 7fd5f8d2bc
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1449500
Change-Id: If6136de7e90083c318bf1ebb0e24172dbfeacb16
2020-10-06 20:23:54 +00:00
Xin Li
9602e3d31a
Merge "DO NOT MERGE - Merge RP1A.201005.006"
2020-10-06 20:17:27 +00:00
Treehugger Robot
10161a66e0
Merge "liblog: add pthread.h to vndk log/log.h" am: 6d452d7e64 am: 7c15f1090d
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1451017
Change-Id: I150cc3788687bc3c593a9acddc2411b01b493525
2020-10-06 20:16:33 +00:00
Treehugger Robot
7c15f1090d
Merge "liblog: add pthread.h to vndk log/log.h" am: 6d452d7e64
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1451017
Change-Id: I8c9a70e10407281e5ab8e5b412a1f2d36a98de7f
2020-10-06 20:02:36 +00:00
Treehugger Robot
6d452d7e64
Merge "liblog: add pthread.h to vndk log/log.h"
2020-10-06 19:30:34 +00:00
Tom Cherry
824ef9ade6
liblog: add pthread.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: Ib99f0de4aac64134c21c0ee09f7ea576ebd0fe9e
2020-10-06 10:33:17 -07:00
The Android Open Source Project
7fd5f8d2bc
DO NOT MERGE - Merge RP1A.201005.006
...
Bug: 168212094
Change-Id: I79a7517bce1c012eac2a2a7c1c2cffc5a3516eaa
Merged-In: Ia85067d4258bde4b875c832d6223db5dd26b8838
2020-10-06 04:30:21 +00:00
Tom Cherry
131f7c960c
Merge "logd: add locks around ~SerializedFlushToState" am: 1bacb2c389 am: d5ed093bc0
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1449535
Change-Id: I005915104a6348d8fa405b7cc3507936a4b800dc
2020-10-05 23:10:46 +00:00
Tom Cherry
d5ed093bc0
Merge "logd: add locks around ~SerializedFlushToState" am: 1bacb2c389
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1449535
Change-Id: I54186d82ba2603a8076ff6714a8f2f59a330643a
2020-10-05 22:52:15 +00:00
Tom Cherry
1bacb2c389
Merge "logd: add locks around ~SerializedFlushToState"
2020-10-05 22:22:52 +00:00
Tom Cherry
28b9eb5130
logd: add locks around ~SerializedFlushToState
...
This accesses shared resources in SerializedLogBuffer and therefore
requires a lock.
Bug: 169736426
Test: malloc_debug_system_tests
Change-Id: I807c65f4719481f933b4917a50f83f933b1929fb
2020-10-05 14:59:19 -07:00
Treehugger Robot
d069bdc667
Merge "liblog: add unistd.h to vndk log/log.h" am: bf426993db am: 939b78f03a
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1449379
Change-Id: Ib6eeb501322a026c286170d28c8f00e6a57e24ea
2020-10-05 21:43:02 +00:00
Treehugger Robot
939b78f03a
Merge "liblog: add unistd.h to vndk log/log.h" am: bf426993db
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1449379
Change-Id: Ib330c53d055a1a89e25ed24269bda6926ac0e704
2020-10-05 21:32:38 +00:00
Treehugger Robot
bf426993db
Merge "liblog: add unistd.h to vndk log/log.h"
2020-10-05 21:14:13 +00:00
Tom Cherry
4dc06fe2d8
Merge "Revert "Remove logging symlinks from system/core/include"" am: c274f9ff69 am: c1fe112b9d
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1449381
Change-Id: Icdcee14084a0d93a237946e154c5da98d23aebc1
2020-10-05 20:08:09 +00:00
Christopher Ferris
69499b2849
Merge "libunwindstack: Support signal frame CIEs." am: f30b12e6ad am: 27dcf97048
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1443619
Change-Id: I7012919b016f7d41d2fd315be44be8017afb491c
2020-10-05 20:07:50 +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
363046766a
Merge "Activate encryption for /data/app-staging folder" am: f99f09eeda am: 681794c70e
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1435397
Change-Id: I508c9e7815a5ede68337923671d9a038ea3135aa
2020-10-05 18:19:57 +00:00
Tom Cherry
22071e3e76
Merge "Remove logging symlinks from system/core/include" am: f8a89dc3a2 am: 74950cf881
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1428983
Change-Id: I276d0c5ebd58b91bd11612046d657ab7369b28b7
2020-10-05 18:19:42 +00:00
Tom Cherry
0141e93814
Merge "Delete include/private/android_filesystem_config.h" am: 351586822f am: 4f6b65b4f0
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1430210
Change-Id: I70d3ecb03f66bd8501568858aa633a7f5f7fe1cb
2020-10-05 18:19:29 +00: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
bbd0e0f324
Merge "fastboot: add new oem command for post wipe userdata" am: 012ee0ae0a am: 2cfa8fd91c am: bb1c219921
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1429852
Change-Id: I25bad20813a77d58aacc757c8c60b004bbca4120
2020-10-05 03:23:26 +00:00
Joseph Jang
bb1c219921
Merge "fastboot: add new oem command for post wipe userdata" am: 012ee0ae0a am: 2cfa8fd91c
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1429852
Change-Id: Ia63537d1d97f4a09e2e3bfb408a043b3a8774677
2020-10-05 03:05:49 +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
6e740e448e
Merge changes from topic "revert-1433573-vab-libsnapshot-linkage-APIHERUSEB" am: 216ce0985f am: d708fae58e am: bdfa0ac2ef
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1447800
Change-Id: I797132a18c2908be83e7c95545e9617b46106427
2020-10-03 20:49:32 +00:00
Tianjie Xu
d027a15b17
Revert "libsnapshot: Implement OnlineKernelSnapshotWriter::OpenReader." am: ad583f2a16 am: 62d6fdc11a am: afff0d8773
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1447798
Change-Id: Ib3d9deb36a20bf2a9641124e8d2b599e2d0e4a70
2020-10-03 20:49:29 +00:00
Tianjie Xu
bdfa0ac2ef
Merge changes from topic "revert-1433573-vab-libsnapshot-linkage-APIHERUSEB" am: 216ce0985f am: d708fae58e
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1447800
Change-Id: Ie172fe7792d40510114b4ac2874bc40e57bd465e
2020-10-03 20:29:01 +00:00
Tianjie Xu
afff0d8773
Revert "libsnapshot: Implement OnlineKernelSnapshotWriter::OpenReader." am: ad583f2a16 am: 62d6fdc11a
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1447798
Change-Id: I2b943f0e3e27bb91c63c461fa4ed13737943aa25
2020-10-03 20:29:00 +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