OSDN Git Service
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
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 [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
Martijn Coenen [Tue, 7 May 2019 07:01:48 +0000 (00:01 -0700)]
Merge "Stop using trigger_reset_main." am:
91a6c016ec
am:
19e74b3d1f
Change-Id: Ic1b955827da8e13e60734bd4fbbad7523ac97561
Martijn Coenen [Tue, 7 May 2019 06:57:12 +0000 (23:57 -0700)]
Merge "Stop using trigger_reset_main."
am:
91a6c016ec
Change-Id: Id4baa15b619a941c7059d19c59645a45b9060433
Martijn Coenen [Tue, 7 May 2019 06:41:01 +0000 (06:41 +0000)]
Merge "Stop using trigger_reset_main."
Martijn Coenen [Wed, 1 May 2019 19:42:48 +0000 (12:42 -0700)]
Merge "Stop using trigger_reset_main." into qt-dev
am:
9db42907b5
Change-Id: Ife6711c5e0ad5180ce805c8e1df02487c2a957be
Martijn Coenen [Wed, 1 May 2019 17:45:23 +0000 (17:45 +0000)]
Merge "Stop using trigger_reset_main." into qt-dev
Paul Crowley [Tue, 30 Apr 2019 05:27:14 +0000 (22:27 -0700)]
Create /data/vendor_ce/0/facedata in vold_prepare_subdirs
am:
b409ade4d7
Change-Id: I6b3a1624a1bfc0053c75f842a1c6f219071a3fb5
Martijn Coenen [Wed, 24 Apr 2019 08:41:11 +0000 (10:41 +0200)]
Stop using trigger_reset_main.
This trigger was used on FDE devices to bring down the minimal
framework, and worked by shutting down the 'main' service class.
With APEX being introduced, we want to restart all services that were
started after the tmpfs /data was mounted, as those are the services
that haven't been able to use updated APEXes in the (real) /data.
In order to do this, we need to reset more classes; that in turn
made the 'shutdown_main' trigger pretty much similar to the
previously existing 'trigger_shutdown_framework' trigger; so instead
of keeping two duplicate triggers, use only the
'trigger_shutdown_framework' one.
Bug:
118485723
Test: Taimen configured as FDE boots, Taimen configured as FBE boots
Change-Id: I0d80ef2528bd70870b063a2c580cd00a03de9961
Paul Crowley [Wed, 24 Apr 2019 00:04:35 +0000 (17:04 -0700)]
Create /data/vendor_ce/0/facedata in vold_prepare_subdirs
Bug:
131084614
Test: Modified sepolicy to match, ensured directory was created on
Crosshatch
Change-Id: I0978a630149158eb3b8f446abecb12e137e6fae5
Martijn Coenen [Wed, 24 Apr 2019 08:41:11 +0000 (10:41 +0200)]
Stop using trigger_reset_main.
This trigger was used on FDE devices to bring down the minimal
framework, and worked by shutting down the 'main' service class.
With APEX being introduced, we want to restart all services that were
started after the tmpfs /data was mounted, as those are the services
that haven't been able to use updated APEXes in the (real) /data.
In order to do this, we need to reset more classes; that in turn
made the 'shutdown_main' trigger pretty much similar to the
previously existing 'trigger_shutdown_framework' trigger; so instead
of keeping two duplicate triggers, use only the
'trigger_shutdown_framework' one.
Bug:
118485723
Test: Taimen configured as FDE boots, Taimen configured as FBE boots
Change-Id: I0d80ef2528bd70870b063a2c580cd00a03de9961
Paul Lawrence [Tue, 23 Apr 2019 23:33:08 +0000 (16:33 -0700)]
Merge "Use correct Statuses from Checkpoint code" am:
8d4164f92f
am:
7d9a965419
Change-Id: If69ffb3d977cd545ff04609b1240dbef563f0748
Paul Lawrence [Tue, 23 Apr 2019 23:25:53 +0000 (16:25 -0700)]
Merge "Use correct Statuses from Checkpoint code"
am:
8d4164f92f
Change-Id: I35ffbb3bc89eb695aa86c45f4aa0a8633cfd11b9
Treehugger Robot [Tue, 23 Apr 2019 23:07:27 +0000 (23:07 +0000)]
Merge "Use correct Statuses from Checkpoint code"
xzj [Fri, 19 Apr 2019 22:04:40 +0000 (15:04 -0700)]
Merge "fix data encryption fail when ENCRYPTION_FLAG_NO_UI is set" am:
c222ad20ee
am:
a921b6795e
Change-Id: Ia297c274b7a2b0005b31f69354fb4a7773f02439
Paul Lawrence [Fri, 19 Apr 2019 21:26:39 +0000 (14:26 -0700)]
Use correct Statuses from Checkpoint code
Bug:
130190815
Test: Added fake error to code and checked correct error was caught
Change-Id: If9ab9357f0f961607e15a4ba18d9d85bc9923019
xzj [Fri, 19 Apr 2019 21:15:15 +0000 (14:15 -0700)]
Merge "fix data encryption fail when ENCRYPTION_FLAG_NO_UI is set"
am:
c222ad20ee
Change-Id: I5ebb8825b40c3ce088607f8a4aa6d4fb506f6bd5
Treehugger Robot [Fri, 19 Apr 2019 20:27:44 +0000 (20:27 +0000)]
Merge "fix data encryption fail when ENCRYPTION_FLAG_NO_UI is set"
xzj [Fri, 12 Oct 2018 02:17:11 +0000 (10:17 +0800)]
fix data encryption fail when ENCRYPTION_FLAG_NO_UI is set
cause: data partition not being umount before real encryption
Change-Id: If5cc084c182d96c6205359b76ee0c474f6a77a2e
Sudheer Shanka [Fri, 19 Apr 2019 14:16:04 +0000 (07:16 -0700)]
Update remountUidLegacy to handle "full" mount mode.
am:
36bdf7ab54
Change-Id: I08b881cd744a21cb9127b7a2c22b25c388eb070c
Sudheer Shanka [Thu, 18 Apr 2019 22:18:30 +0000 (15:18 -0700)]
Update remountUidLegacy to handle "full" mount mode.
Bug:
130791955
Test: manual
Change-Id: I078c2922d1d5a8d16bbb213201a3cad7b1bf4b86
Sandeep Patil [Wed, 17 Apr 2019 23:06:43 +0000 (16:06 -0700)]
[automerger skipped] Merge "Add visible logs about fstrim run for block based checkpoints" am:
419528be57
am:
9389f389f5 -s ours
am skip reason: change_id I0cb8b6a85ae787e1ba2cdd7998a46942ca69760f with SHA1
e802d475bf is in history
Change-Id: I9fcc5843f969cbaeda85d4fb296e7416ddb1cde2
Sudheer Shanka [Wed, 17 Apr 2019 22:51:04 +0000 (15:51 -0700)]
Merge "Allow sandboxed apps to access only package specific dirs." into qt-dev
am:
0a9469e923
Change-Id: I66084eae25e8b08d6bdec2ea1f6c7e612a6b8a64
Sandeep Patil [Wed, 17 Apr 2019 22:10:43 +0000 (15:10 -0700)]
Merge "Add visible logs about fstrim run for block based checkpoints"
am:
419528be57
Change-Id: I546d5cb3807cd217e9ab992ee517d4a3164566e5
Sudheer Shanka [Wed, 17 Apr 2019 22:07:47 +0000 (22:07 +0000)]
Merge "Allow sandboxed apps to access only package specific dirs." into qt-dev
Treehugger Robot [Wed, 17 Apr 2019 21:11:04 +0000 (21:11 +0000)]
Merge "Add visible logs about fstrim run for block based checkpoints"
Sandeep Patil [Mon, 15 Apr 2019 15:45:27 +0000 (08:45 -0700)]
Add visible logs about fstrim run for block based checkpoints
Bug:
120095226
Test: Tested by forcing /data/system/last-fstrim last modified time back
2 years & manually trigger checkpoint using 'vdc checkpoint startCheckpoint 1'
Change-Id: I0cb8b6a85ae787e1ba2cdd7998a46942ca69760f
Merged-In: I0cb8b6a85ae787e1ba2cdd7998a46942ca69760f
Signed-off-by: Sandeep Patil <sspatil@google.com>
Sandeep Patil [Wed, 17 Apr 2019 17:07:06 +0000 (10:07 -0700)]
Add visible logs about fstrim run for block based checkpoints
am:
e802d475bf
Change-Id: If021a8803121094807dc232ad08ca6b984032e23
android-build-team Robot [Tue, 16 Apr 2019 22:41:51 +0000 (22:41 +0000)]
Merge cherrypicks of [
7077329,
7077440,
7077330,
7077468,
7076852,
7077469,
7077580,
7077581,
7077582,
7074025,
7077706,
7077707,
7077708,
7077388,
7077583,
7077584,
7077585,
7077726,
7077727,
7077331,
7077332,
7077459,
7077709,
7077710,
7077711,
7077712,
7077460,
7077461,
7077333,
7077334,
7077696] into pi-qpr3-release
Change-Id: Icfc00a7020e3f0589ff268071c8f6d18b6f2a445
Woody Lin [Mon, 11 Mar 2019 12:58:20 +0000 (20:58 +0800)]
Fsync directories before delete key
The boot failure symptom is reproduced on Walleye devices. System boots
up after taking OTA and try to upgrade key, but keymaster returns "failed
to ugprade key". Device reboots to recovery mode because of the failure,
and finally trapped in bootloader screen. Possible scenario is:
(After taking OTA)
vold sends old key and op=UPGRADE to keymaster
keymaster creates and saves new key to RPMB, responses new key to vold
vold saves new key as temp key
vold renames temp key to main key -------------- (1) -- still in cache
vold sends old key and op=DELETE_KEY to keymaster
keymaster removes old key from RPMB ------------ (2) -- write directly to RPMB
==> SYSTEM INTERRUPTED BY CRASH OR SOMETHING; ALL CACHE LOST.
==> System boots up, key in RPMB is deleted but key in storage is old key.
Solution: A Fsync is required between (1) and (2) to cover this case.
Detail analysis: b/
124279741#comment21
Bug:
112145641
Bug:
124279741
Test: Insert fault right after deleteKey in vold::begin (KeyStorage.cpp),
original boot failure symptom is NOT reproducible.
Change-Id: Ia042b23699c37c94758fb660aecec64d39f39738
Merged-In: Ib8c349d6d033f86b247f4b35b8354d97cf249d26
(cherry picked from commit
a598e04a91c64741f9f71c6511a7ced7f71d194e)
Paul Crowley [Fri, 7 Dec 2018 23:36:09 +0000 (15:36 -0800)]
Fsync directories after creating files
Bug:
112145641
Bug:
124279741
Bug:
120248692
Test: adb shell locksettings set-pin 1111 && \
adb shell "echo b > /proc/sysrq-trigger"
Change-Id: I53d252942c21365983b4f8b6e0948b1864f195c1
Merged-In: I53d252942c21365983b4f8b6e0948b1864f195c1
(cherry picked from commit
2e58acb4123e559fddfd4013af3ead6c055bd71c)
Sandeep Patil [Mon, 15 Apr 2019 15:45:27 +0000 (08:45 -0700)]
Add visible logs about fstrim run for block based checkpoints
Bug:
120095226
Test: Tested by forcing /data/system/last-fstrim last modified time back
2 years & manually trigger checkpoint using 'vdc checkpoint startCheckpoint 1'
Change-Id: I0cb8b6a85ae787e1ba2cdd7998a46942ca69760f
Signed-off-by: Sandeep Patil <sspatil@google.com>
Sudheer Shanka [Fri, 12 Apr 2019 20:55:28 +0000 (13:55 -0700)]
Allow sandboxed apps to access only package specific dirs.
Bug:
130427780
Test: manual
Test: atest cts/hostsidetests/appsecurity/src/android/appsecurity/cts/ExternalStorageHostTest.java
Change-Id: I7afcea090306336c4033860084a2a436d2bb4740
Woody Lin [Wed, 10 Apr 2019 14:16:45 +0000 (07:16 -0700)]
[automerger skipped] Fsync directories before delete key am:
a598e04a91 -s ours
am:
3654986ae5 -s ours
am skip reason: change_id Ib8c349d6d033f86b247f4b35b8354d97cf249d26 with SHA1
37c82f5c0f is in history
Change-Id: I3f8153ebd963a10b1633103ccc941389be0164ee
Paul Crowley [Wed, 10 Apr 2019 14:16:34 +0000 (07:16 -0700)]
[automerger skipped] Fsync directories after creating files am:
2e58acb412 -s ours
am:
c6f4d9d5ae -s ours
am skip reason: change_id I53d252942c21365983b4f8b6e0948b1864f195c1 with SHA1
621d9b9732 is in history
Change-Id: I920346bf310aab6a16cea70d6e213fcff325134c
Woody Lin [Wed, 10 Apr 2019 14:06:41 +0000 (07:06 -0700)]
[automerger skipped] Fsync directories before delete key
am:
a598e04a91 -s ours
am skip reason: change_id Ib8c349d6d033f86b247f4b35b8354d97cf249d26 with SHA1
37c82f5c0f is in history
Change-Id: Ifec2d700dbe6bbe55e65e6e07003d1e77fb3dbc2
Paul Crowley [Wed, 10 Apr 2019 14:06:31 +0000 (07:06 -0700)]
[automerger skipped] Fsync directories after creating files
am:
2e58acb412 -s ours
am skip reason: change_id I53d252942c21365983b4f8b6e0948b1864f195c1 with SHA1
621d9b9732 is in history
Change-Id: Icdb62b1d4e6e7ca7d18df1083020d61d9b215165
Narayan Kamath [Wed, 10 Apr 2019 08:29:07 +0000 (01:29 -0700)]
AppFuseUtil: Call ForceUnmount before PrepareDir.
am:
15ad33a8b1
Change-Id: I39e24afab685cfbdcc492d135937bb2e34110818