OSDN Git Service
Steven Moreland [Thu, 5 Sep 2019 21:18:22 +0000 (14:18 -0700)]
Remove libhwbinder/libhidltransport deps
Since these were combined into libhidlbase.
Bug:
135686713
Test: build only (libhwbinder/libhidltransport are empty)
Change-Id: I890b572d537d66ecb49effd8efc782279c52956e
Xin Li [Thu, 5 Sep 2019 16:53:32 +0000 (16:53 +0000)]
Merge "DO NOT MERGE - Merge Android 10 into master"
Xin Li [Wed, 4 Sep 2019 20:35:31 +0000 (13:35 -0700)]
DO NOT MERGE - Merge Android 10 into master
Bug:
139893257
Change-Id: I9dc8417f0d87c87eac13437834e69a52c1887258
Paul Lawrence [Tue, 27 Aug 2019 15:45:00 +0000 (08:45 -0700)]
Merge "Fix ext4/metadata/udc issue"
am:
ee867be1f1
Change-Id: I69b89b464a4d04b27e1da7d3990dcbec9525afe4
Paul Lawrence [Tue, 27 Aug 2019 15:21:58 +0000 (15:21 +0000)]
Merge "Fix ext4/metadata/udc issue"
Paul Lawrence [Tue, 27 Aug 2019 01:32:29 +0000 (18:32 -0700)]
Merge "Fix crash in mainline"
am:
3a0d51f6b7
Change-Id: I63925fd090707f56076a59349c237a83f4ec8234
Treehugger Robot [Tue, 27 Aug 2019 01:01:28 +0000 (01:01 +0000)]
Merge "Fix crash in mainline"
Paul Lawrence [Mon, 26 Aug 2019 22:09:41 +0000 (15:09 -0700)]
Fix crash in mainline
Current behavior:
Assume not checkpointing
cp_startCheckpoint creates the file in metadata
cp_needsCheckpoint will now set isCheckpointing to true
cp_commitCheckpoint will now think there is a checkpoint, and try to
commit it. This will fail on ext4 and it will return false, leading to
bad things.
cp_startCheckpoint is called when staging an apex module for update.
After this point, several things could go wrong:
If a keystore key is deleted, it calls cp_needsCheckpoint to see if the
delete should be deferred until cp_commitCheckpoint. The delete will now
be deferred, meaning that this key will never be deleted, using up the
key sots in trustzone
If a trim is scheduled through idle maintenance, this also calls
cp_needsCheckpoint, so the trims will not occur.
If either of these happens before a system crash, the device will not
recover since the system calls commitCheckpoint which will now crash.
When the system then goes on to reboot, the checkpoint will not be
triggered, since the commitCheckpoint call will have deleted the
checkpoint flag file before crashing.
Bug:
138952436
Test: vdc checkpoint startCheckpoint 5
vdc checkpoint needsCheckpoint
vdc checkpoint commitChanges
stop;start
commitChanges fails, then device loops
After applying this test, commitChanges succeeds and device does
not loop
Change-Id: I135099625f77344d1f8d2e8688735871c44ef2f5
Paul Lawrence [Fri, 23 Aug 2019 00:32:17 +0000 (17:32 -0700)]
Merge "Fix race condition is commitCheckpoint"
am:
1059810759
Change-Id: I3cb7931ee01d208cb6f5f435aa5fc40cacd78b65
Treehugger Robot [Fri, 23 Aug 2019 00:11:38 +0000 (00:11 +0000)]
Merge "Fix race condition is commitCheckpoint"
Paul Lawrence [Thu, 22 Aug 2019 16:51:18 +0000 (09:51 -0700)]
Fix race condition is commitCheckpoint
If cp_commitCheckpoint is called twice at the same time, the second call
to setBowState will fail.
Add lock to remove possibility, and protect all uses of isCheckpointing
Bug:
138952436
Test: Boots after flashing in checkpoint mode
Change-Id: I131298adc506c3c176774d15e642b13d5f991087
Paul Lawrence [Wed, 7 Aug 2019 22:22:57 +0000 (15:22 -0700)]
Fix ext4/metadata/udc issue
Test: Cannot test since no device supports this combo
Bug:
137924328
Change-Id: I451c90e0826ede71876f3e4f260e7083f3ab3fdb
David Anderson [Fri, 12 Jul 2019 23:25:24 +0000 (16:25 -0700)]
Merge "libdm now requires linking to libext2_uuid."
am:
9e821da9fe
Change-Id: Id33c9fc83352535cb45f27e70dec6000c73b07a5
David Anderson [Fri, 12 Jul 2019 23:03:41 +0000 (23:03 +0000)]
Merge "libdm now requires linking to libext2_uuid."
Xin Li [Tue, 9 Jul 2019 23:22:08 +0000 (16:22 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master"
am:
711f4faac3 -s ours
am skip reason: subject contains skip directive
Change-Id: I334dfe94d70709434fd3c98c581a80cc4a7c00a4
Xin Li [Tue, 9 Jul 2019 22:18:16 +0000 (15:18 -0700)]
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master
am:
33080d8b49 -s ours
am skip reason: subject contains skip directive
Change-Id: Id76bbc6615fa330e65f857c365e96c446855a242
Xin Li [Tue, 9 Jul 2019 21:38:47 +0000 (21:38 +0000)]
Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master"
Xin Li [Tue, 9 Jul 2019 18:24:40 +0000 (11:24 -0700)]
DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master
Bug:
136196576
Change-Id: I2fc2c9bb2631e627ebe74b6f081819c1eb0f3fcd
android-build-team Robot [Mon, 8 Jul 2019 23:36:54 +0000 (23:36 +0000)]
Snap for
5622519 from
59295fbb94e3a75c3341419aadbc66c560296179 to pi-platform-release
Change-Id: I402d144258df8eefe4c87766616ba32221bfbb67
Xin Li [Mon, 1 Jul 2019 21:00:30 +0000 (21:00 +0000)]
DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (
5699924) into stage-aosp-master
Bug:
134405016
Change-Id: I19ac2279aa2cb1c5ad444d25484aa1ec0d7efac6
Paul Lawrence [Thu, 27 Jun 2019 23:46:06 +0000 (16:46 -0700)]
[automerger skipped] Merge "Add property to prevent commit for Vts test" am:
5bcfb5bf45
am:
3507d68556 -s ours
am skip reason: change_id I20441964dbc7b6ad5b445fa17a1374c1282bbbd8 with SHA1
3f1ce062d5 is in history
Change-Id: I2a5fe3fc7bbf3af55facde1ab07bd0559d8e7d87
Paul Lawrence [Thu, 27 Jun 2019 23:26:57 +0000 (16:26 -0700)]
Merge "Add property to prevent commit for Vts test"
am:
5bcfb5bf45
Change-Id: Ic6b0e863fb9c6ddea2cb19390a9520c3c87cf704
Paul Lawrence [Thu, 27 Jun 2019 23:25:58 +0000 (16:25 -0700)]
[automerger skipped] Merge "Make ext4 userdata checkpoints work with metadata encryption" into qt-dev
am:
dde9704664 -s ours
am skip reason: change_id I8365a40298b752af4bb10d00d9ff58ce04beab1f with SHA1
236e5e800e is in history
Change-Id: I11c77206000895c27aee9ad8326778ec95e233df
Treehugger Robot [Thu, 27 Jun 2019 22:39:57 +0000 (22:39 +0000)]
Merge "Add property to prevent commit for Vts test"
TreeHugger Robot [Thu, 27 Jun 2019 22:36:27 +0000 (22:36 +0000)]
Merge "Make ext4 userdata checkpoints work with metadata encryption" into qt-dev
David Anderson [Thu, 27 Jun 2019 20:40:09 +0000 (13:40 -0700)]
libdm now requires linking to libext2_uuid.
Bug:
135771280
Test: mm vold -j
Change-Id: Id71c71926841581d4d3bc4a66f4c06294df21028
Paul Lawrence [Thu, 27 Jun 2019 18:03:03 +0000 (11:03 -0700)]
Merge "Make ext4 userdata checkpoints work with metadata encryption" am:
2c792e0720
am:
5f19ef31c8
Change-Id: I7da7077c70484cb5873b9316058bc73158c19ab6
Paul Lawrence [Thu, 27 Jun 2019 17:50:06 +0000 (10:50 -0700)]
Merge "Make ext4 userdata checkpoints work with metadata encryption"
am:
2c792e0720
Change-Id: I1aed54ccf98fb73b29ed13fa971bbfbb25a489ae
Paul Lawrence [Tue, 25 Jun 2019 21:44:33 +0000 (14:44 -0700)]
Make ext4 userdata checkpoints work with metadata encryption
When both ext4 user data checkpoints and metadata encryption are
enabled, we are creating two stacked dm devices. This had not been
properly thought through or debugged.
Test: Enable metadata encryption on taimen (add
keydirectory=/metadata/vold/metadata_encryption to flags for userdata in
fstab.hardware)
Unfortunately metadata is not wiped by fastboot -w, so it is
necessary to rm metadata/vold -rf whenever you wipe data.
fastboot flashall -w works
fastboot reboot -w works
A normal boot works
Disable checkpoint commits with
setprop persist.vold.dont_commit_checkpoint 1
vdc checkpoint startCheckpoint 10
adb reboot
wait for device to fully boot then
adb reboot
Wait for device to fully boot then
adb logcat -d | grep Checkpoint shows the rollback in the logs
This tests encryption on top of checkpoints with commit, encryption
without checkpoints, and rollback, which seems to be the key cases.
Also ran same tests on unmodified Taimen and Blueline
Bug:
135905679
Merged-In: I8365a40298b752af4bb10d00d9ff58ce04beab1f
Change-Id: I8365a40298b752af4bb10d00d9ff58ce04beab1f
Treehugger Robot [Thu, 27 Jun 2019 17:29:03 +0000 (17:29 +0000)]
Merge "Make ext4 userdata checkpoints work with metadata encryption"
Tri Vo [Thu, 27 Jun 2019 02:43:21 +0000 (19:43 -0700)]
Merge "vold: use RAII wake locks" am:
b585363d93
am:
99fd2a4b5a
Change-Id: I8e37d315ecb6bad994d2a9c748cfc835756e265e
Tri Vo [Thu, 27 Jun 2019 02:30:09 +0000 (19:30 -0700)]
Merge "vold: use RAII wake locks"
am:
b585363d93
Change-Id: I21be9e28c19901c9ca3aa91eb2f7394d1f788ff2
Tri Vo [Thu, 27 Jun 2019 01:59:08 +0000 (01:59 +0000)]
Merge "vold: use RAII wake locks"
Paul Lawrence [Tue, 25 Jun 2019 21:44:33 +0000 (14:44 -0700)]
Make ext4 userdata checkpoints work with metadata encryption
When both ext4 user data checkpoints and metadata encryption are
enabled, we are creating two stacked dm devices. This had not been
properly thought through or debugged.
Test: Enable metadata encryption on taimen (add
keydirectory=/metadata/vold/metadata_encryption to flags for userdata in
fstab.hardware)
Unfortunately metadata is not wiped by fastboot -w, so it is
necessary to rm metadata/vold -rf whenever you wipe data.
fastboot flashall -w works
fastboot reboot -w works
A normal boot works
Disable checkpoint commits with
setprop persist.vold.dont_commit_checkpoint 1
vdc checkpoint startCheckpoint 10
adb reboot
wait for device to fully boot then
adb reboot
Wait for device to fully boot then
adb logcat -d | grep Checkpoint shows the rollback in the logs
This tests encryption on top of checkpoints with commit, encryption
without checkpoints, and rollback, which seems to be the key cases.
Bug:
135905679
Change-Id: I8365a40298b752af4bb10d00d9ff58ce04beab1f
Xin Li [Wed, 26 Jun 2019 22:09:02 +0000 (15:09 -0700)]
[automerger skipped] Restore historical behavior with fsck_msdos (always accept fixes).
am:
3601f4790b -s ours
am skip reason: change_id I1d50a7e52fda34e59eb6f051c7fde115a6cd5255 with SHA1
3d3a9a7f1c is in history
Change-Id: Ib97568c9eaecb3c52e4703f7d14a8235b9cc0cc4
Tri Vo [Fri, 21 Jun 2019 19:21:48 +0000 (12:21 -0700)]
vold: use RAII wake locks
Prevents wake lock leaks, e.g. b/
133175847
Bug:
133175847
Test: boot blueline
Change-Id: Icda4c81e00a61adec6a12c61c329867fef284dc5
Xin Li [Thu, 6 Jun 2019 18:33:51 +0000 (11:33 -0700)]
Restore historical behavior with fsck_msdos (always accept fixes).
Bug:
133725065
Merged-In: I1d50a7e52fda34e59eb6f051c7fde115a6cd5255
Change-Id: I1d50a7e52fda34e59eb6f051c7fde115a6cd5255
Ruslan Tkhakokhov [Fri, 21 Jun 2019 15:27:57 +0000 (08:27 -0700)]
Merge "Merged-In Revert "vold: use RAII wake locks"" am:
2ebb5c5b96
am:
fce081efa6
Change-Id: If58a55eecb04453f69e51cdc242f5ab71fb7ddc1
Ruslan Tkhakokhov [Fri, 21 Jun 2019 15:08:21 +0000 (08:08 -0700)]
Merge "Merged-In Revert "vold: use RAII wake locks""
am:
2ebb5c5b96
Change-Id: I6fe423a47de01eaf3d5bcc27fbfd7d96ea184156
Ruslan Tkhakokhov [Fri, 21 Jun 2019 10:34:43 +0000 (10:34 +0000)]
Merge "Merged-In Revert "vold: use RAII wake locks""
Ruslan Tkhakokhov [Fri, 21 Jun 2019 10:31:11 +0000 (10:31 +0000)]
Merged-In Revert "vold: use RAII wake locks"
This reverts commit
242130f3f8180baef35649f350ca737d0b0c6ae3.
Reason for revert: breaks the build
Change-Id: Ide809a114b2a04538f3ba4ed8af934bf326e54f3
David Anderson [Fri, 21 Jun 2019 01:16:56 +0000 (18:16 -0700)]
Merge "Block and wait for /dev/block/loop<N> to appear in case it was created asynchronously." am:
ee5eb39169
am:
5973b8cf00
Change-Id: Ieb48b5b3ca4e5576d22b7db9bcc229b8fb2f47fb
David Anderson [Fri, 21 Jun 2019 01:06:16 +0000 (18:06 -0700)]
Merge "Block and wait for /dev/block/loop<N> to appear in case it was created asynchronously."
am:
ee5eb39169
Change-Id: Ib82969daab218360712f1b3bf2c2069c95932ee2
David Anderson [Thu, 20 Jun 2019 23:59:47 +0000 (23:59 +0000)]
Merge "Block and wait for /dev/block/loop<N> to appear in case it was created asynchronously."
Tri Vo [Thu, 20 Jun 2019 22:57:53 +0000 (15:57 -0700)]
Merge "vold: use RAII wake locks" am:
798aa303da
am:
56c6681ba8
Change-Id: I3f87e1ad31701c24fdc426c3bd562a47871e3631
Tri Vo [Thu, 20 Jun 2019 22:25:46 +0000 (15:25 -0700)]
Merge "vold: use RAII wake locks"
am:
798aa303da
Change-Id: I157e8ceb8ece246d00ce345bd110023977a6d208
Tri Vo [Thu, 20 Jun 2019 19:42:50 +0000 (19:42 +0000)]
Merge "vold: use RAII wake locks"
Tri Vo [Tue, 18 Jun 2019 22:33:01 +0000 (15:33 -0700)]
vold: use RAII wake locks
Prevents wake lock leaks, e.g. b/
133175847
Bug:
133175847
Test: boot blueline
Change-Id: I62fd1c6c3abbfd35aebe11343abd717a7cf4eef7
David Anderson [Tue, 11 Jun 2019 21:51:25 +0000 (14:51 -0700)]
Block and wait for /dev/block/loop<N> to appear in case it was created asynchronously.
Bug:
134711825
Test: StorageManagerTest
Change-Id: Id8616804bba622226ca21b8eff0d3eb577b4b7e0
Paul Lawrence [Sat, 15 Jun 2019 00:20:04 +0000 (17:20 -0700)]
Merge "Fail startCheckpoint if checkpoints not supported" am:
6c704f736c
am:
7c35004b27
Change-Id: Ie1906ef96432bed1058cc8ce6ecb6cd58adc769c
Paul Lawrence [Sat, 15 Jun 2019 00:11:00 +0000 (17:11 -0700)]
Merge "Fail startCheckpoint if checkpoints not supported"
am:
6c704f736c
Change-Id: I631c9828782452ab763d108d85082cd2120c5ee7
Treehugger Robot [Fri, 14 Jun 2019 23:30:49 +0000 (23:30 +0000)]
Merge "Fail startCheckpoint if checkpoints not supported"
Paul Lawrence [Wed, 12 Jun 2019 19:03:01 +0000 (12:03 -0700)]
Add property to prevent commit for Vts test
Old approach (do not start class main) does not work because when
testings userdebug GSI on user system, adb does not start until the
framework starts.
Bug:
134126407
Test: Test passes with userdebug GSI on user Taimen
Merged-in: I20441964dbc7b6ad5b445fa17a1374c1282bbbd8
Change-Id: I20441964dbc7b6ad5b445fa17a1374c1282bbbd8
Paul Lawrence [Thu, 13 Jun 2019 20:18:10 +0000 (13:18 -0700)]
Add property to prevent commit for Vts test
am:
3f1ce062d5
Change-Id: Ia742cb1ff865f5fd7b13843e72ee5309d90560db
Paul Lawrence [Wed, 12 Jun 2019 19:03:01 +0000 (12:03 -0700)]
Add property to prevent commit for Vts test
Old approach (do not start class main) does not work because when
testings userdebug GSI on user system, adb does not start until the
framework starts.
Bug:
134126407
Test: Test passes with userdebug GSI on user Taimen
Change-Id: I20441964dbc7b6ad5b445fa17a1374c1282bbbd8
Xin Li [Mon, 10 Jun 2019 20:28:35 +0000 (13:28 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master" am:
170b45c75f -s ours
am:
b74ed73043 -s ours
am skip reason: subject contains skip directive
Change-Id: I5b825a62b888b1d3a654da7ebc3c5cacb56f226d
Xin Li [Mon, 10 Jun 2019 20:21:45 +0000 (13:21 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master"
am:
170b45c75f -s ours
am skip reason: subject contains skip directive
Change-Id: Iab16bbdc743962c766e7d556b7eeef4098f8a4ba
The Android Open Source Project [Mon, 10 Jun 2019 20:17:51 +0000 (13:17 -0700)]
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master am:
1aebde23aa -s ours
am:
d81505cac0 -s ours
am skip reason: subject contains skip directive
Change-Id: I5487c6e6a413585c86d346f0c8bf434bd29b4ecd
The Android Open Source Project [Mon, 10 Jun 2019 20:06:15 +0000 (13:06 -0700)]
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master
am:
1aebde23aa -s ours
am skip reason: subject contains skip directive
Change-Id: Ib9778c146fb82c715408db89cdaf45339f23ef05
Xin Li [Mon, 10 Jun 2019 19:54:58 +0000 (19:54 +0000)]
Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master"
The Android Open Source Project [Mon, 10 Jun 2019 16:32:29 +0000 (09:32 -0700)]
DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master
Bug:
134605042
Change-Id: Ie32488cf0d10e1a5622d24f604a7a5e84c56e79c
Daniel Rosenberg [Sat, 8 Jun 2019 01:55:10 +0000 (18:55 -0700)]
Merge "Fix include order" am:
0a0b5b5f02
am:
44c18e1723
Change-Id: I80ae48916a7cb5182bb802c6919387204b860b09
Daniel Rosenberg [Sat, 8 Jun 2019 01:49:05 +0000 (18:49 -0700)]
Merge "Fix include order"
am:
0a0b5b5f02
Change-Id: I002b546d733dd55ced79aeb118c6394ce973d609
Treehugger Robot [Sat, 8 Jun 2019 01:30:38 +0000 (01:30 +0000)]
Merge "Fix include order"
Daniel Rosenberg [Fri, 7 Jun 2019 23:06:51 +0000 (16:06 -0700)]
[automerger skipped] Merge "Defer deleteKey in KeyStorage in Checkpointing mode" am:
fc4ad04ffe
am:
288fca9266 -s ours
am skip reason: change_id Ie5fc2d098355e2d095c53e9a95a6a8c7ab7ed051 with SHA1
8cc5716ef1 is in history
Change-Id: I7d9f111a30c196b86f84cdaa3fd1081733be789f
Daniel Rosenberg [Fri, 7 Jun 2019 23:00:50 +0000 (16:00 -0700)]
Merge "Defer deleteKey in KeyStorage in Checkpointing mode"
am:
fc4ad04ffe
Change-Id: Ib4f127130bdf05fe092fec15d999e5d645441303
Treehugger Robot [Fri, 7 Jun 2019 22:48:00 +0000 (22:48 +0000)]
Merge "Defer deleteKey in KeyStorage in Checkpointing mode"
Xin Li [Fri, 7 Jun 2019 22:23:25 +0000 (15:23 -0700)]
Merge "Restore historical behavior with fsck_msdos (always accept fixes)." am:
a2518c7fe7
am:
8941a145a0
Change-Id: I3ccf537b4802baf6ff43b1ff3b24f44c59e9fa08
Xin Li [Fri, 7 Jun 2019 22:17:24 +0000 (15:17 -0700)]
Merge "Restore historical behavior with fsck_msdos (always accept fixes)."
am:
a2518c7fe7
Change-Id: I91202edd2dbca6e8eb4c58fa25453da22045a062
Treehugger Robot [Fri, 7 Jun 2019 22:05:20 +0000 (22:05 +0000)]
Merge "Restore historical behavior with fsck_msdos (always accept fixes)."
Daniel Rosenberg [Fri, 7 Jun 2019 21:18:14 +0000 (14:18 -0700)]
Fix include order
Change-Id: Id839cc52801f3d0fce2d46faecf813812613e431
Test: None
Daniel Rosenberg [Fri, 7 Jun 2019 03:38:38 +0000 (20:38 -0700)]
Defer deleteKey in KeyStorage in Checkpointing mode
Don't delete keys in checkpointing mode. Instead wait until the
checkpoint has been committed.
Bug:
134631661
Test: Flash A with a working build. Flash B with a broken build. Test
that the device rolls back to A without getting sent to recovery.
Merged-In: Ie5fc2d098355e2d095c53e9a95a6a8c7ab7ed051
Change-Id: Ie5fc2d098355e2d095c53e9a95a6a8c7ab7ed051
Daniel Rosenberg [Fri, 7 Jun 2019 20:05:41 +0000 (13:05 -0700)]
Defer deleteKey in KeyStorage in Checkpointing mode
am:
8cc5716ef1
Change-Id: I38a8d0de1760f0d526cb00c441129dc025049358
Xin Li [Fri, 7 Jun 2019 07:29:27 +0000 (00:29 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Skip pi-platform-release (PPRL.190605.003) into stage-aosp-master" into stage-aosp-master
am:
b02c30cbf3 -s ours
am skip reason: subject contains skip directive
Change-Id: I456b2e5bf172a79d1c6aaf535de73b96897f5a4a
Xin Li [Fri, 7 Jun 2019 07:16:31 +0000 (00:16 -0700)]
[automerger skipped] DO NOT MERGE - Skip pi-platform-release (PPRL.190605.003) into stage-aosp-master
am:
3a6c897d05 -s ours
am skip reason: subject contains skip directive
Change-Id: Ie610a4b4078750bd62db70c8998643689dc6e25c
TreeHugger Robot [Fri, 7 Jun 2019 07:06:19 +0000 (07:06 +0000)]
Merge "DO NOT MERGE - Skip pi-platform-release (PPRL.190605.003) into stage-aosp-master" into stage-aosp-master
Daniel Rosenberg [Fri, 7 Jun 2019 03:38:38 +0000 (20:38 -0700)]
Defer deleteKey in KeyStorage in Checkpointing mode
Don't delete keys in checkpointing mode. Instead wait until the
checkpoint has been committed.
Bug:
134631661
Test: Flash A with a working build. Flash B with a broken build. Test
that the device rolls back to A without getting sent to recovery.
Change-Id: Ie5fc2d098355e2d095c53e9a95a6a8c7ab7ed051
Xin Li [Thu, 6 Jun 2019 18:33:51 +0000 (11:33 -0700)]
Restore historical behavior with fsck_msdos (always accept fixes).
Bug:
133725065
Change-Id: I1d50a7e52fda34e59eb6f051c7fde115a6cd5255
Dan Willemsen [Thu, 6 Jun 2019 04:23:39 +0000 (21:23 -0700)]
Merge "Match src paths with aidl package name" am:
94f300295d
am:
4be1fb5196
Change-Id: I19f23733b9114fe661b2e59b792cb9b1a2490465
Dan Willemsen [Thu, 6 Jun 2019 03:36:52 +0000 (20:36 -0700)]
Merge "Match src paths with aidl package name"
am:
94f300295d
Change-Id: I0e7afb27913038f302e43a97091825a0689dc1b6
Treehugger Robot [Thu, 6 Jun 2019 02:19:19 +0000 (02:19 +0000)]
Merge "Match src paths with aidl package name"
Xin Li [Wed, 5 Jun 2019 22:43:40 +0000 (15:43 -0700)]
DO NOT MERGE - Skip pi-platform-release (PPRL.190605.003) into stage-aosp-master
Bug:
134605042
Change-Id: I6b90349f94ffd8a05d5f04e8a6fb24018d93bedd
Dan Willemsen [Sat, 15 Sep 2018 04:28:50 +0000 (21:28 -0700)]
Match src paths with aidl package name
In order for the build system to track updates to the header files
during incremental builds, always specify the src files using the same
path as the package for C++ compilations.
Bug:
112114177
Test: treehugger
Change-Id: I9a2d638cbde46f67e2d5761f5b5113cc7e068ec5
android-build-team Robot [Wed, 5 Jun 2019 02:04:18 +0000 (02:04 +0000)]
Snap for
5524043 from
a736dde3f4625ffbc6487065c53545e76f7433b4 to pi-platform-release
Change-Id: I9998fe9b732b39b669a06a30fa7a22847c6b65ee
Sudheer Shanka [Fri, 31 May 2019 22:06:48 +0000 (15:06 -0700)]
Support "full" mode when updating bind mounts of a process.
am:
8f2ff80e87
Change-Id: I63eb199ebc731cafa137d8e12802abf2e078e909
Sudheer Shanka [Thu, 30 May 2019 23:40:20 +0000 (16:40 -0700)]
Support "full" mode when updating bind mounts of a process.
Bug:
133829348
Test: manual
Test: atest cts/hostsidetests/appsecurity/src/android/appsecurity/cts/ExternalStorageHostTest.java
Change-Id: I5f48ecbfe8cce243fa75a2e8447ce1d4676003ad
David Anderson [Wed, 22 May 2019 04:12:08 +0000 (21:12 -0700)]
Merge "Replace manual dm ioctls with libdm." am:
bc5818774c
am:
f1fa57d602
Change-Id: I8f49bf924272195c6ae2e827cfb78766d644d154
David Anderson [Wed, 22 May 2019 00:13:45 +0000 (17:13 -0700)]
Merge "Replace manual dm ioctls with libdm."
am:
bc5818774c
Change-Id: Id7ebd240d7c3e16397fcdd044113b54700b11fd5
David Anderson [Tue, 21 May 2019 21:46:38 +0000 (21:46 +0000)]
Merge "Replace manual dm ioctls with libdm."
Nick Kralevich [Wed, 15 May 2019 19:31:03 +0000 (12:31 -0700)]
Merge "FsCrypt.cpp: Do delayed restorecon on /data/vendor_ce" am:
3b290ece1a
am:
07d6eff5d5
Change-Id: I7f461143877014399c9a4f207af94ac75d7aa0a6
Nick Kralevich [Wed, 15 May 2019 19:25:11 +0000 (12:25 -0700)]
Merge "FsCrypt.cpp: Do delayed restorecon on /data/vendor_ce"
am:
3b290ece1a
Change-Id: I7d25b2611fb9c8e84139e3a00ccd88a1cc145f3b
Treehugger Robot [Wed, 15 May 2019 19:06:04 +0000 (19:06 +0000)]
Merge "FsCrypt.cpp: Do delayed restorecon on /data/vendor_ce"
Paul Lawrence [Wed, 15 May 2019 16:42:04 +0000 (09:42 -0700)]
Fail startCheckpoint if checkpoints not supported
Bug:
131815738
Test: vdc checkpoint startCheckpoint 2 succeeds on blueline
It fails with a modified fstab with no checkpoint=fs flag
Change-Id: I6d55810a1f711a670f18fbd10d8779c15f4e3cba
Nick Kralevich [Tue, 14 May 2019 16:30:29 +0000 (09:30 -0700)]
FsCrypt.cpp: Do delayed restorecon on /data/vendor_ce
When Android boots after file_contexts has changed, the boot process
walks the entire /data partition, updating any changed SELinux labels as
appropriate. However, credential encrypted ("ce") directories are
deliberately excluded from this early boot directory walk. Files within
ce directories have their filenames encrypted, and as a result, cannot
match the file_contexts entries. Only after the user has unlocked their
device are the unencrypted filenames available and a restorecon
appropriate.
Ensure that we do a post-unlock restorecon on /data/vendor_ce, like we
do for /data/system_ce and /data/misc_ce. This ensures the labels on
files within these directories are correct after the device has been
unlocked.
(cherrypicked from commit
6a3ef488e5fea4f9c5992c76f4b20e7c800881c1)
Bug:
132349934
Test: See bug
132349934 comment #12 for test procedure
Change-Id: Ifcbef5fdfb236ec6dea418efa9d965db3a3b782f
Nick Kralevich [Wed, 15 May 2019 16:17:58 +0000 (09:17 -0700)]
FsCrypt.cpp: Do delayed restorecon on /data/vendor_ce
am:
6a3ef488e5
Change-Id: I900196a62e3fb2bd806a0f2980dca5aad138a7dd
Nick Kralevich [Tue, 14 May 2019 16:30:29 +0000 (09:30 -0700)]
FsCrypt.cpp: Do delayed restorecon on /data/vendor_ce
When Android boots after file_contexts has changed, the boot process
walks the entire /data partition, updating any changed SELinux labels as
appropriate. However, credential encrypted ("ce") directories are
deliberately excluded from this early boot directory walk. Files within
ce directories have their filenames encrypted, and as a result, cannot
match the file_contexts entries. Only after the user has unlocked their
device are the unencrypted filenames available and a restorecon
appropriate.
Ensure that we do a post-unlock restorecon on /data/vendor_ce, like we
do for /data/system_ce and /data/misc_ce. This ensures the labels on
files within these directories are correct after the device has been
unlocked.
Bug:
132349934
Test: See bug
132349934 comment #12 for test procedure
Change-Id: Ifcbef5fdfb236ec6dea418efa9d965db3a3b782f
David Anderson [Mon, 13 May 2019 20:02:54 +0000 (13:02 -0700)]
Replace manual dm ioctls with libdm.
This mostly 1:1 replaces manual ioctls to device-mapper with calls to
libdm. There were two exceptions:
(1) There is a very old table-load-retry loop to workaround issues with
umount (b/
7220345). This loop has been preserved, however, it now
includes DM_DEV_CREATE as well as DM_TABLE_LOAD.
(2) There was some ancient code to set DM_DEV_GEOMETRY for obb
dm-devices. This never did anything since geometry must be set after
loading a table. When setting it before (as vold was doing), the
subsequent DM_TABLE_LOAD will clear it.
Bug:
132206403
Test: FBE device boots
FBE device w/ metadata encryption boots
FDE device boots
atest StorageManagerIntegrationTest
Change-Id: Ib6db6b47329f093ac7084edaf604eddace8b9ac6
Sudheer Shanka [Fri, 10 May 2019 06:58:25 +0000 (23:58 -0700)]
[automerger skipped] Remove storage sandboxes related code.
am:
ebce4cc16b -s ours
am skip reason: change_id Ib3272a47a901ed106474039e72f123b11f5443ff with SHA1
5fceb48da1 is in history
Change-Id: I0d248b5b041118b318c36858882342d626fcb7b0
Sudheer Shanka [Mon, 29 Apr 2019 17:46:35 +0000 (10:46 -0700)]
Remove storage sandboxes related code.
Bug:
131115422
Test: manual
Test: atest --test-mapping packages/providers/MediaProvider
Test: atest cts/hostsidetests/appsecurity/src/android/appsecurity/cts/ExternalStorageHostTest.java
Test: atest DownloadProviderTests
Test: atest cts/tests/app/src/android/app/cts/DownloadManagerTest.java
Test: atest cts/tests/app/DownloadManagerLegacyTest/src/android/app/cts/DownloadManagerLegacyTest.java
Test: atest cts/tests/app/DownloadManagerApi28Test/src/android/app/cts/DownloadManagerApi28Test.java
Change-Id: Ib3272a47a901ed106474039e72f123b11f5443ff
Merged-In: Ib3272a47a901ed106474039e72f123b11f5443ff
Sudheer Shanka [Mon, 29 Apr 2019 17:46:35 +0000 (10:46 -0700)]
Remove storage sandboxes related code.
Bug:
131115422
Test: manual
Test: atest --test-mapping packages/providers/MediaProvider
Test: atest cts/hostsidetests/appsecurity/src/android/appsecurity/cts/ExternalStorageHostTest.java
Test: atest DownloadProviderTests
Test: atest cts/tests/app/src/android/app/cts/DownloadManagerTest.java
Test: atest cts/tests/app/DownloadManagerLegacyTest/src/android/app/cts/DownloadManagerLegacyTest.java
Test: atest cts/tests/app/DownloadManagerApi28Test/src/android/app/cts/DownloadManagerApi28Test.java
Change-Id: Ib3272a47a901ed106474039e72f123b11f5443ff
Merged-In: Ib3272a47a901ed106474039e72f123b11f5443ff
OSDN Git Service
