Yo Chiang
15c3a91fc7
Merge "fs_mgr: SkipMountingPartitions() support glob patterns" am: b20e9a3606
am: d56f6e14cd
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1660038
Change-Id: I269cb08492c1f84217eba216d683e8717afce266
2021-04-07 06:00:43 +00:00
Yo Chiang
d56f6e14cd
Merge "fs_mgr: SkipMountingPartitions() support glob patterns" am: b20e9a3606
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1660038
Change-Id: I5c2bcaa4bd5ade9efb43e2e8449aca75a706a93b
2021-04-07 05:38:47 +00:00
Yo Chiang
b20e9a3606
Merge "fs_mgr: SkipMountingPartitions() support glob patterns"
2021-04-07 05:04:21 +00:00
Treehugger Robot
006db0e7f5
Merge "[LSC] Add LOCAL_LICENSE_KINDS to system/core" am: 02c97e837d
am: 908ec8b03b
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1666093
Change-Id: Ie2cc311031e48547375b0d64c2176b76805e7310
2021-04-07 04:37:15 +00:00
Treehugger Robot
908ec8b03b
Merge "[LSC] Add LOCAL_LICENSE_KINDS to system/core" am: 02c97e837d
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1666093
Change-Id: I7fb14e61ef2ecb6c09826d527cf627da3e9ea733
2021-04-07 04:16:45 +00:00
Treehugger Robot
02c97e837d
Merge "[LSC] Add LOCAL_LICENSE_KINDS to system/core"
2021-04-07 03:46:57 +00:00
Bob Badour
8c2fe15b47
[LSC] Add LOCAL_LICENSE_KINDS to system/core
...
Added SPDX-license-identifier-Apache-2.0 to:
libstats/pull_rust/Android.bp
Bug: 68860345
Bug: 151177513
Bug: 151953481
Test: m all
Exempt-From-Owner-Approval: janitorial work
Change-Id: I362f72ab99850558ddc7b50108c1ec6a212cb258
2021-04-06 17:46:33 -07:00
Treehugger Robot
aec92150f2
Merge "ueventd: Fix wrong argument index in devpath comparison" am: 0cf8af6860
am: deca6caf46
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1664601
Change-Id: I1064e69d61b26af47919e26f1de13ce8f3782e0d
2021-04-07 00:32:24 +00:00
Treehugger Robot
deca6caf46
Merge "ueventd: Fix wrong argument index in devpath comparison" am: 0cf8af6860
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1664601
Change-Id: I2c165867af3e8e0b99427f185a77632c0071da4b
2021-04-06 23:47:23 +00:00
Treehugger Robot
0cf8af6860
Merge "ueventd: Fix wrong argument index in devpath comparison"
2021-04-06 23:10:05 +00:00
David Anderson
6a9b8d0c9b
Merge changes from topic "revert-1660531-max-boot-level-crypto-KFMCEDKSIV" am: 0da1d617d2
am: 3b7cf575f0
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1665501
Change-Id: I62819572f7c0ffc7fae73ceeebb1992d55bda958
2021-04-06 23:06:28 +00:00
Ulyana Trafimovich
8d7a612f69
Revert "Set earlyBootEnded before apex starts" am: 82cfe66794
am: 6e6e200706
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1665500
Change-Id: I36d1c2c3f15c4fadc6fcc4d06c40dad57682eb0e
2021-04-06 23:06:27 +00:00
David Anderson
3b7cf575f0
Merge changes from topic "revert-1660531-max-boot-level-crypto-KFMCEDKSIV" am: 0da1d617d2
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1665501
Change-Id: I8af99bce75b91cfb0a61daef1983fceda153fc83
2021-04-06 22:35:48 +00:00
Ulyana Trafimovich
6e6e200706
Revert "Set earlyBootEnded before apex starts" am: 82cfe66794
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1665500
Change-Id: I5a5cb6e6d073ddbf5daad345003d885dc7232671
2021-04-06 22:35:37 +00:00
TreeHugger Robot
25c011d3e3
Merge "[LSC] Add LOCAL_LICENSE_KINDS to system/core" into rvc-qpr-dev-plus-aosp
2021-04-06 22:29:55 +00:00
David Anderson
0da1d617d2
Merge changes from topic "revert-1660531-max-boot-level-crypto-KFMCEDKSIV"
...
* changes:
Revert "Expose AID_KEYSTORE"
Revert "Set earlyBootEnded before apex starts"
2021-04-06 21:54:44 +00:00
Bob Badour
694946141e
[LSC] Add LOCAL_LICENSE_KINDS to system/core
...
Added SPDX-license-identifier-Apache-2.0 to:
libstats/pull_rust/Android.bp
Bug: 68860345
Bug: 151177513
Bug: 151953481
Test: m all
Exempt-From-Owner-Approval: janitorial work
Change-Id: Ia5bb619b514f38555b83c470ffb18f6a9a04d487
2021-04-06 12:36:47 -07:00
Akilesh Kailash
c292a1b1fb
Merge "libsnapshot:snapuserd: Terminate daemon after applying OTA." am: 591edca44d
am: e6ef7f8db8
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1663841
Change-Id: I07388dba7b0a06eb4ee6ef9c32c7dd395f7ba1a0
2021-04-06 19:28:50 +00:00
Akilesh Kailash
e6ef7f8db8
Merge "libsnapshot:snapuserd: Terminate daemon after applying OTA." am: 591edca44d
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1663841
Change-Id: I959ca9db5f20a9af47934db18ac21618f6ce9bf1
2021-04-06 18:43:51 +00:00
Akilesh Kailash
591edca44d
Merge "libsnapshot:snapuserd: Terminate daemon after applying OTA."
2021-04-06 18:02:52 +00:00
Ulyana Trafimovich
82cfe66794
Revert "Set earlyBootEnded before apex starts"
...
Revert "Cryptographic security for MAX_BOOT_LEVEL"
Revert submission 1660531-max-boot-level-crypto
Reason for revert: broken test com.android.tests.odsign.OnDeviceSigningHostTest#verifyArtUpgradeSignsFiles on aosp-master on aosp_cf_x86_64_phone-userdebug at 7261517
Reverted Changes:
Ia3b968afc:Set earlyBootEnded before apex starts
Ia69891291:Expose AID_KEYSTORE
I12530cd13:Cryptographic security for MAX_BOOT_LEVEL
Bug: 184635938
Change-Id: Ibf63734a02a2c132142671c0fae5d0177bf46079
Test: forrest run for the broken test
2021-04-06 16:07:07 +00:00
Ulyana Trafimovich
a801eabe11
Revert "Expose AID_KEYSTORE"
...
Revert "Cryptographic security for MAX_BOOT_LEVEL"
Revert submission 1660531-max-boot-level-crypto
Reason for revert: broken test com.android.tests.odsign.OnDeviceSigningHostTest#verifyArtUpgradeSignsFiles on aosp-master on aosp_cf_x86_64_phone-userdebug at 7261517
Reverted Changes:
Ia3b968afc:Set earlyBootEnded before apex starts
Ia69891291:Expose AID_KEYSTORE
I12530cd13:Cryptographic security for MAX_BOOT_LEVEL
Bug: 184635938
Change-Id: Id02f63a794544d650abb95c8e7f201eea03391eb
Test: forrest run for the broken test
2021-04-06 16:07:07 +00:00
Paul Crowley
973b355fe1
Merge changes from topic "max-boot-level-crypto" am: de2769dc1e
am: e5c1b5691c
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1664099
Change-Id: I37ad486598817bd69441b4aa56b480fb0e434edd
2021-04-06 12:35:34 +00:00
Paul Crowley
fbd1c2a870
Expose AID_KEYSTORE am: 8306ab68f7
am: 4adc0fac1a
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1663719
Change-Id: Id004c56e519adc5be65a77523f1da3001f615ac2
2021-04-06 12:35:33 +00:00
Paul Crowley
e5c1b5691c
Merge changes from topic "max-boot-level-crypto" am: de2769dc1e
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1664099
Change-Id: I6664936eef2074623da530333ee903611164344d
2021-04-06 11:43:56 +00:00
Paul Crowley
4adc0fac1a
Expose AID_KEYSTORE am: 8306ab68f7
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1663719
Change-Id: Iffd046482da8f773efa53d396530fc3f6321c057
2021-04-06 11:43:43 +00:00
Paul Crowley
de2769dc1e
Merge changes from topic "max-boot-level-crypto"
...
* changes:
Set earlyBootEnded before apex starts
Expose AID_KEYSTORE
2021-04-06 11:15:29 +00:00
Yo Chiang
9d0a20e003
Merge changes from topic "ReadDefaultFstab_requires_sepolicies" am: aeb962f09a
am: 127e1bee5f
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1657801
Change-Id: Ia4f6ecf7b4260821db57f23a9d8cbd3aff424152
2021-04-06 05:02:31 +00:00
Yi-Yo Chiang
b22c55d12f
fs_mgr: Strengthen ReadFstabFromFile() around gsi_public_metadata_file am: ea4369d141
am: 71fbb66b2a
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1647010
Change-Id: I73247edfbe3d282bd1e4599f847c0f64a25f6053
2021-04-06 05:02:29 +00:00
Paul Crowley
02e0ddcaf9
Set earlyBootEnded before apex starts
...
earlyBootEnded signals to keystore2 to read the database for the first
time, and start the MAX_BOOT_LEVEL system. It must therefore run
after /data is mounted and /data/misc/keystore is created, but before
apexd or odsign starts.
Bug: 176450483
Test: cuttlefish: check keystore2 logs to ensure all looks well.
Change-Id: Ia3b968afc38edf95712480e99e545ba88ea309c3
2021-04-05 21:40:36 -07:00
Yo Chiang
127e1bee5f
Merge changes from topic "ReadDefaultFstab_requires_sepolicies" am: aeb962f09a
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1657801
Change-Id: I6ebdb5602f3c6e824822a1766522d66876c0f57a
2021-04-06 04:20:30 +00:00
Yi-Yo Chiang
71fbb66b2a
fs_mgr: Strengthen ReadFstabFromFile() around gsi_public_metadata_file am: ea4369d141
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1647010
Change-Id: I2d1c8037c6066902ae61d417ee4e4004eba03be5
2021-04-06 04:20:12 +00:00
Yo Chiang
aeb962f09a
Merge changes from topic "ReadDefaultFstab_requires_sepolicies"
...
* changes:
fs_mgr: Refactor ReadDefaultFstab() and ReadFstabFromFile()
fs_mgr: Strengthen ReadFstabFromFile() around gsi_public_metadata_file
2021-04-06 03:37:58 +00:00
Suchang Woo
8681f7e7a3
ueventd: Fix wrong argument index in devpath comparison
...
args[2](user name to run as) is used instead of args[1](devpath).
Test: atest CtsInitTestCases
Signed-off-by: Suchang Woo <suchang.woo@samsung.com>
Change-Id: Id271755993d55e332bad54d0414e2232071e5e8e
2021-04-06 11:15:28 +09:00
Akilesh Kailash
e2883c1ea0
libsnapshot:snapuserd: Terminate daemon after applying OTA.
...
When all threads are terminated, dm-user handler's are removed
from the list. When the last handler is removed, daemon is
shutdown gracefully.
Bug: 183652708
Test: 1: Apply full OTA and verify daemon is terminated; reapply the OTA
to verify daemon is restarted again.
2: vts_libsnapshot_test
Signed-off-by: Akilesh Kailash <akailash@google.com>
Change-Id: Ibd41223fc0eba884993a533fcc95661f72805db2
2021-04-05 21:50:46 +00:00
Steven Moreland
e1a51daf9b
Merge "ANDROID_UTILS_REF_BASE_DISABLE_IMPLICIT_CONSTRUCTION" am: 99037347d6
am: d8c4c860ef
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1660499
Change-Id: I6674c7ce8a425e8615a258700702117277103861
2021-04-05 20:47:32 +00:00
Steven Moreland
d8c4c860ef
Merge "ANDROID_UTILS_REF_BASE_DISABLE_IMPLICIT_CONSTRUCTION" am: 99037347d6
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1660499
Change-Id: I8551b54d9b7384076d63cb5ec8fa5300f3a47267
2021-04-05 20:26:46 +00:00
Joel Galenson
6a21910b9a
Merge "Add Rust interface for the pull API." am: 177f93f9cb
am: 5b2b727eb9
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1658885
Change-Id: I3888d5649ce9390299735736d0279d28eb6c4201
2021-04-05 20:06:15 +00:00
Steven Moreland
99037347d6
Merge "ANDROID_UTILS_REF_BASE_DISABLE_IMPLICIT_CONSTRUCTION"
2021-04-05 20:00:39 +00:00
Joel Galenson
5b2b727eb9
Merge "Add Rust interface for the pull API." am: 177f93f9cb
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1658885
Change-Id: I5e31c0ffe099ec775be63ce6f7166f2ee74ddf4e
2021-04-05 19:22:15 +00:00
Joel Galenson
177f93f9cb
Merge "Add Rust interface for the pull API."
2021-04-05 18:50:47 +00:00
Steven Moreland
da75cef983
ANDROID_UTILS_REF_BASE_DISABLE_IMPLICIT_CONSTRUCTION
...
In form, inspired by ANDROID_BASE_UNIQUE_FD_DISABLE_IMPLICIT_CONVERSION.
We get occasional bugs about sp double-ownership. When this flag is
enabled, we have:
- you must construct RefBase objects using sp<>::make
- you must construct wp<> objects by converting them to sp<>
- if you want to convert a raw pointer to an sp<> object (this is
possible since the refcount is used internally, and is used commonly
on this*), then you must use 'assertStrongRefExists' semantics which
aborts if there is no strong ref held. That is, if a client uses
std::make_shared and then calls a function which internally used to
call `sp<T>(this)`, you would now call
`sp<T>::assertStrongRefExists(this)`, and the double ownership
problem would become a runtime error.
Bug: 184190315
Test: libutils_test
Change-Id: Ie18d3146420df1808e3733027070ec234dda4e9d
2021-04-05 17:45:18 +00:00
Paul Crowley
8306ab68f7
Expose AID_KEYSTORE
...
Keystore uses this as the user ID for keys that it creates for its
own use.
Bug: 176450483
Test: keystore2_test
Change-Id: Ia698912917cd209eebcfc007a8badce7a39159d6
2021-04-03 08:38:41 -07:00
Steven Moreland
2eb2b5edbf
Merge "libutils: better docs for sp<>::make" am: 767f264fa4
am: fb91070a83
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1663182
Change-Id: Ic744b3b251fccd14b616dc1ce691dd57f5ab3255
2021-04-02 22:31:20 +00:00
Steven Moreland
fb91070a83
Merge "libutils: better docs for sp<>::make" am: 767f264fa4
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1663182
Change-Id: Ibb44ea12326866e455f7efc1541197fb04b77874
2021-04-02 21:51:28 +00:00
Steven Moreland
767f264fa4
Merge "libutils: better docs for sp<>::make"
2021-04-02 21:16:52 +00:00
Steven Moreland
09b0495b47
libutils: better docs for sp<>::make
...
Bug: 184190315
Test: N/A
Change-Id: I56621058b9d85122b7dca3727e40c8c85595031f
2021-04-02 17:26:16 +00:00
Yo Chiang
6b4cb7a2dd
Merge "fs_mgr: Suppress SkipMountingPartitions log in ReadFstabFromFile" am: a2b662cf23
am: 14d8badf58
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1662019
Change-Id: I3b45b72a20837eaa13409976116651700fe7161c
2021-04-02 06:32:01 +00:00
Akilesh Kailash
a3ab630b7f
Merge "libsnapshot:snapuserd: Fix memory leak" am: ef8d3c39b5
am: 1e88568d40
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1662684
Change-Id: Ibaad94a42f6586a83fb38002ea3c03669744ce00
2021-04-02 06:31:51 +00:00
Yo Chiang
14d8badf58
Merge "fs_mgr: Suppress SkipMountingPartitions log in ReadFstabFromFile" am: a2b662cf23
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1662019
Change-Id: If9f26afce00a670ddae8ebe950f42c2ca5b33e54
2021-04-02 05:48:30 +00:00