OSDN Git Service
Paul Lawrence [Fri, 8 Feb 2019 22:07:57 +0000 (14:07 -0800)]
Merge "Support header versioning in dm-bow" am:
96336c716b am:
06181f3605
am:
96bdc38fb7
Change-Id: I76f8e0b5d231f1ca103efcefc1800dabdddc5fa0
Paul Lawrence [Fri, 8 Feb 2019 22:03:33 +0000 (14:03 -0800)]
Merge "Support header versioning in dm-bow" am:
96336c716b
am:
06181f3605
Change-Id: Ifc24e161ccf3564bf94c695053d51cbb600dd963
Paul Lawrence [Fri, 8 Feb 2019 22:00:32 +0000 (14:00 -0800)]
Merge "Support header versioning in dm-bow"
am:
96336c716b
Change-Id: I8d71b57c51e2290c2633b286ea91a54a3ea0d582
Treehugger Robot [Fri, 8 Feb 2019 21:55:29 +0000 (21:55 +0000)]
Merge "Support header versioning in dm-bow"
Paul Lawrence [Fri, 8 Feb 2019 21:36:49 +0000 (13:36 -0800)]
Merge "Suport variable blocksizes in dm-bow restore" am:
73c0028901 am:
fdac3684c4
am:
fd742dbf30
Change-Id: I63742c9f263735b549b25aaae372d34ec82c8a18
Paul Lawrence [Fri, 8 Feb 2019 21:32:47 +0000 (13:32 -0800)]
Merge "Suport variable blocksizes in dm-bow restore" am:
73c0028901
am:
fdac3684c4
Change-Id: Id4c4aae860bc819d240864f3d60edf03a1c5e255
Paul Lawrence [Fri, 8 Feb 2019 21:27:49 +0000 (13:27 -0800)]
Merge "Suport variable blocksizes in dm-bow restore"
am:
73c0028901
Change-Id: I42cf7db1bca5905e93546b1df78b8439c22ef198
Treehugger Robot [Fri, 8 Feb 2019 21:16:58 +0000 (21:16 +0000)]
Merge "Suport variable blocksizes in dm-bow restore"
Paul Lawrence [Fri, 18 Jan 2019 18:28:34 +0000 (10:28 -0800)]
Support header versioning in dm-bow
Test: Make sure still boots, restores
Change-Id: I903f58cb22472dbbbbb4c27ed1d88ed1f7c7dc5d
Paul Lawrence [Thu, 10 Jan 2019 21:06:07 +0000 (13:06 -0800)]
Suport variable blocksizes in dm-bow restore
Test: Test that restore still works
Change-Id: I7259e3efd1cd0ee13c74336a7e53158b6bceed57
Daniel Rosenberg [Fri, 8 Feb 2019 02:19:20 +0000 (18:19 -0800)]
Merge "Mark A/B Boot success before committing checkpoint" am:
d6bbe746d7 am:
294a252092
am:
f3d55f4e0c
Change-Id: I545b0fb45d3ed1bde6fa4002c37675cce6a6a37d
Daniel Rosenberg [Fri, 8 Feb 2019 02:02:10 +0000 (18:02 -0800)]
Merge "Mark A/B Boot success before committing checkpoint" am:
d6bbe746d7
am:
294a252092
Change-Id: I8887afd2726724d6c9b9da0fa7595bde741fb748
Daniel Rosenberg [Fri, 8 Feb 2019 01:49:55 +0000 (17:49 -0800)]
Merge "Mark A/B Boot success before committing checkpoint"
am:
d6bbe746d7
Change-Id: I2876835681d42bade620081d508a7490d664c8aa
Daniel Rosenberg [Fri, 8 Feb 2019 01:40:54 +0000 (01:40 +0000)]
Merge "Mark A/B Boot success before committing checkpoint"
Sudheer Shanka [Wed, 6 Feb 2019 20:39:19 +0000 (12:39 -0800)]
Remove sandbox specific bind mounts from root namespace.
Update vold to only create package sandboxes and not do any bind mounts.
After zygote forks, all the necessary bind mounts will be setup for
the process.
Bug:
124009234
Test: manual
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 MediaProviderTests
Test: atest cts/tests/tests/provider/src/android/provider/cts/MediaStore*
Change-Id: Ia42209cb74cbc423bb09c1c51cb7a164f7c568da
Paul Crowley [Wed, 6 Feb 2019 03:42:50 +0000 (19:42 -0800)]
Merge "Fix search for values in blkId output" am:
0fbc5af676 am:
56715503b5
am:
464ff37019
Change-Id: I5d47ddedc29cafa05424e6bfcfd6b99885614d7c
Paul Crowley [Wed, 6 Feb 2019 03:38:50 +0000 (19:38 -0800)]
Merge "Fix search for values in blkId output" am:
0fbc5af676
am:
56715503b5
Change-Id: I9b24f0bd748a38ca29e2b258a54cd2b9bdcb7cc3
Paul Crowley [Wed, 6 Feb 2019 03:33:46 +0000 (19:33 -0800)]
Merge "Fix search for values in blkId output"
am:
0fbc5af676
Change-Id: Ica4be0ea315c0aa6a2d6289139a88a8fa944deac
Treehugger Robot [Wed, 6 Feb 2019 03:19:32 +0000 (03:19 +0000)]
Merge "Fix search for values in blkId output"
Paul Crowley [Tue, 5 Feb 2019 23:33:34 +0000 (15:33 -0800)]
Fix search for values in blkId output
Bug:
122497152
Test: atest tests/Utils_test.cpp
Test: adb shell sm partition disk:7,32 private ; adb logcat -d
Change-Id: Ic7d32bdbc0c55ce1d21f7f9e74c6a6fb3dcf332a
Daniel Rosenberg [Wed, 23 Jan 2019 23:16:04 +0000 (15:16 -0800)]
Mark A/B Boot success before committing checkpoint
This marks the slot as successful within commitChanges, increasing the
available roll back window significantly.
Test: When taking an update on a checkpoint enabled device, it
marks the slot as successful just before committing the
checkpoint. Visible in logs as call to vdc commitChanges,
followed by "Marked slot as booted succesfully."
Bug:
123260515
Change-Id: If71fcde57b3bdee2cfaabb590f123a2d00da3228
Daniel Rosenberg [Mon, 4 Feb 2019 23:34:06 +0000 (15:34 -0800)]
Merge "Use global default_fstab instead of re-reading" am:
64f5e5bb38 am:
fd5d1b173c
am:
8442c10304
Change-Id: I218e252ff21f51cb87bbd1bddc9a0c1048072476
Daniel Rosenberg [Mon, 4 Feb 2019 23:30:00 +0000 (15:30 -0800)]
Merge "Use global default_fstab instead of re-reading" am:
64f5e5bb38
am:
fd5d1b173c
Change-Id: I7ec6ba24f23b3ab62317802422eb2b01e616bce1
Daniel Rosenberg [Mon, 4 Feb 2019 23:25:00 +0000 (15:25 -0800)]
Merge "Use global default_fstab instead of re-reading"
am:
64f5e5bb38
Change-Id: Ief94647963db3c48f1aeb89e7d8ccd5f7cb63da7
Daniel Rosenberg [Mon, 4 Feb 2019 23:14:51 +0000 (23:14 +0000)]
Merge "Use global default_fstab instead of re-reading"
Daniel Rosenberg [Sat, 2 Feb 2019 03:25:47 +0000 (19:25 -0800)]
Use global default_fstab instead of re-reading
VoldUtils already has a pre-parsed fstab. Use it instead.
Test: Checkpoint functions continue to work
Change-Id: I96cbab467a7b809c92c4f6cdf7a06abca8c5aa5e
Tom Cherry [Fri, 1 Feb 2019 01:23:24 +0000 (17:23 -0800)]
Merge "Move over to the C++ Fstab class" am:
b6d5cd20d7 am:
4e8e70a949
am:
f61f61a6a0
Change-Id: I90f0f0e1161463cef8542a586b53274ec5a2f5ee
Tom Cherry [Fri, 1 Feb 2019 01:18:20 +0000 (17:18 -0800)]
Merge "Move over to the C++ Fstab class" am:
b6d5cd20d7
am:
4e8e70a949
Change-Id: I08d7937f718739f6444780cbd0cc72634dba841c
Tom Cherry [Fri, 1 Feb 2019 01:13:44 +0000 (17:13 -0800)]
Merge "Move over to the C++ Fstab class"
am:
b6d5cd20d7
Change-Id: Ia9c8b38cb014f30f0ca609bd71cfe1b0de9c27d3
Tom Cherry [Fri, 1 Feb 2019 01:02:50 +0000 (01:02 +0000)]
Merge "Move over to the C++ Fstab class"
Tom Cherry [Tue, 29 Jan 2019 22:34:01 +0000 (14:34 -0800)]
Move over to the C++ Fstab class
Test: build and boot
Change-Id: Id3850c9c133f6644073a2439368501253a2a94a9
LongPing Wei [Wed, 30 Jan 2019 16:50:43 +0000 (08:50 -0800)]
Merge "Remove secontext.h, secontext.cpp, hash.h" am:
eb00112e09 am:
f058440b3b
am:
b6bd5f21b8
Change-Id: I6e11c6a1d7633ef4e5f9c9d2f7fff19306c7753b
LongPing Wei [Wed, 30 Jan 2019 16:45:42 +0000 (08:45 -0800)]
Merge "Remove secontext.h, secontext.cpp, hash.h" am:
eb00112e09
am:
f058440b3b
Change-Id: I339fb6d110cc76ae7bc650736f94880789b0d5a4
LongPing Wei [Wed, 30 Jan 2019 16:40:38 +0000 (08:40 -0800)]
Merge "Remove secontext.h, secontext.cpp, hash.h"
am:
eb00112e09
Change-Id: Ie24ba4a5336a3a8537b43fa2996e53b0dbd85d74
Treehugger Robot [Wed, 30 Jan 2019 16:29:26 +0000 (16:29 +0000)]
Merge "Remove secontext.h, secontext.cpp, hash.h"
LongPing Wei [Wed, 30 Jan 2019 08:03:14 +0000 (16:03 +0800)]
Remove secontext.h, secontext.cpp, hash.h
cryptfs.cpp and MetadataCrypt.cpp can use android::vold::sFsckContext directly.
hash.h is unuseful.
Test: make
Change-Id: I7acdac97d6ed1c9b2a5dc367fcea8aa2942192e8
Eric Biggers [Tue, 29 Jan 2019 21:16:03 +0000 (13:16 -0800)]
Merge "cryptfs: improve logging of dm-crypt device creation" am:
f028d279ae am:
26aaaeaf10
am:
71c2640ac0
Change-Id: Ifed1e1242cd0e5e6fec7cbd710a8a9cb1dcb67a6
Eric Biggers [Tue, 29 Jan 2019 21:12:23 +0000 (13:12 -0800)]
Merge "cryptfs: improve logging of dm-crypt device creation" am:
f028d279ae
am:
26aaaeaf10
Change-Id: I214cc397a8a20eb3cce0c3f41b069fb4fc4fe3c2
Eric Biggers [Tue, 29 Jan 2019 21:08:12 +0000 (13:08 -0800)]
Merge "cryptfs: improve logging of dm-crypt device creation"
am:
f028d279ae
Change-Id: I348e4a6ac62cdd8575e1cdd0602a73442459d0de
Eric Biggers [Tue, 29 Jan 2019 20:58:29 +0000 (20:58 +0000)]
Merge "cryptfs: improve logging of dm-crypt device creation"
Eric Biggers [Tue, 29 Jan 2019 18:51:32 +0000 (10:51 -0800)]
Merge "cryptfs: round down dm-crypt device size to crypto sector boundary" am:
e7205eaa44 am:
b45636cd35
am:
4b42da8e1a
Change-Id: I350a4a6cc8ed052ec5ac2208add168f6a0b5ba92
Eric Biggers [Tue, 29 Jan 2019 18:47:27 +0000 (10:47 -0800)]
Merge "cryptfs: round down dm-crypt device size to crypto sector boundary" am:
e7205eaa44
am:
b45636cd35
Change-Id: I8361f350fdc16079e9cff61d161af5f0641865d1
Eric Biggers [Tue, 29 Jan 2019 18:42:28 +0000 (10:42 -0800)]
Merge "cryptfs: round down dm-crypt device size to crypto sector boundary"
am:
e7205eaa44
Change-Id: I4e1a75d8c34388c1b75ce4d9797f21530d01d1ac
Eric Biggers [Tue, 29 Jan 2019 18:30:55 +0000 (18:30 +0000)]
Merge "cryptfs: round down dm-crypt device size to crypto sector boundary"
Eric Biggers [Fri, 25 Jan 2019 20:11:25 +0000 (12:11 -0800)]
cryptfs: improve logging of dm-crypt device creation
Log the main configuration of the dm-crypt device -- the name, the
cipher, the keysize, the real device, and the length -- in addition to
the extra parameters which we were already logging.
(We can't simply log the actual string passed to the kernel, of course,
because that includes the key. So we choose the fields individually.)
Test: booted device configured to use FDE and checked the log message
Change-Id: Ia95de807c4fad68d93b7e7e73508a01e5139dc76
Eric Biggers [Fri, 25 Jan 2019 18:47:55 +0000 (10:47 -0800)]
cryptfs: round down dm-crypt device size to crypto sector boundary
This is needed to make adoptable storage volumes work with a 4K crypto
sector size when the block device size is not a multiple of 4K.
It is fine to do this because the filesystem ends on a 4K boundary
anyway and doesn't use any partial block at the end.
Bug:
123375298
Test: booted device configured to use FDE with sector size 4k, ran
'sm set-virtual-disk true' and formatted the virtual SD card as
adoptable storage. Then did the same but with a temporary patch
that changed kSizeVirtualDisk to be misaligned
Change-Id: I95ee6d7dcaaa8989c674aea9988c09116e830b0c
Daniel Rosenberg [Fri, 25 Jan 2019 04:47:52 +0000 (20:47 -0800)]
Merge "Preserve options on remount in commitChanges" am:
aaac873faf am:
b6c1c24f86
am:
a20b92c0b0
Change-Id: Ifcef103b42a92614db1a5d77951f6bf027b92478
Daniel Rosenberg [Fri, 25 Jan 2019 04:42:34 +0000 (20:42 -0800)]
Merge "Preserve options on remount in commitChanges" am:
aaac873faf
am:
b6c1c24f86
Change-Id: I0d7963e307591612e6ab47bff27b49f8f6a1dd2f
Daniel Rosenberg [Fri, 25 Jan 2019 04:39:32 +0000 (20:39 -0800)]
Merge "Preserve options on remount in commitChanges"
am:
aaac873faf
Change-Id: Ie09902ef6111cf2aa57014cb97dcdcbe04ecaf86
Treehugger Robot [Fri, 25 Jan 2019 04:26:17 +0000 (04:26 +0000)]
Merge "Preserve options on remount in commitChanges"
Daniel Rosenberg [Fri, 25 Jan 2019 02:23:18 +0000 (18:23 -0800)]
Preserve options on remount in commitChanges
Copy the existing mount options when remounting f2fs for checkpointing
mode.
Bug:
123376509
Test: Boot with checkpointing, and ensure entries match fstab
Change-Id: If022d9872a44657b550ab892259230805716dc77
Daniel Rosenberg [Thu, 24 Jan 2019 06:43:28 +0000 (22:43 -0800)]
Merge "Add supportsCheckpoint" am:
9b2b8fd459 am:
908a4569e9
am:
4cd2102637
Change-Id: I73fea54d60f27468a46bca872ae2f21bdfcb67a1
Daniel Rosenberg [Thu, 24 Jan 2019 06:36:28 +0000 (22:36 -0800)]
Merge "Add supportsCheckpoint" am:
9b2b8fd459
am:
908a4569e9
Change-Id: I44edd3fed37f5e41c29b8265eb549ab3d39bb0a6
Daniel Rosenberg [Thu, 24 Jan 2019 06:30:20 +0000 (22:30 -0800)]
Merge "Add supportsCheckpoint"
am:
9b2b8fd459
Change-Id: I893b20737f20c0a21be2a4068fb8b49cdb54ed80
Treehugger Robot [Thu, 24 Jan 2019 06:14:44 +0000 (06:14 +0000)]
Merge "Add supportsCheckpoint"
Daniel Rosenberg [Wed, 23 Jan 2019 01:27:25 +0000 (17:27 -0800)]
Add supportsCheckpoint
This returns true if any entries in the fstab have checkpoint=
set.
Test: Call vdc checkpoint supportsCheckpoint. Should return 1
iff an fstab entry has checkpoint=fs or checkpoint=block set
Bug:
111020314
Change-Id: Ic79bc96ded4da6605f73992dcff542e7cb50d705
Eric Biggers [Tue, 22 Jan 2019 19:48:34 +0000 (11:48 -0800)]
Merge "cryptfs: check for errors in create_encrypted_random_key()" am:
f156c40404 am:
8938607c02
am:
d043f574a8
Change-Id: I46e5b938b70b3fada8ced6c63a35d62df6a53354
Eric Biggers [Tue, 22 Jan 2019 19:38:29 +0000 (11:38 -0800)]
Merge "Utils: correctly handle read() errors in ReadRandomBytes()" am:
a2bd436594 am:
038a274e8a
am:
e5296cc04d
Change-Id: I0f81be91efee4512510d9e0422b96d8e75951cd4
Eric Biggers [Tue, 22 Jan 2019 19:00:26 +0000 (11:00 -0800)]
Merge "cryptfs: check for errors in create_encrypted_random_key()" am:
f156c40404
am:
8938607c02
Change-Id: Iaa851a756275b0027e8415e92a6391d4640bbc1f
Eric Biggers [Tue, 22 Jan 2019 19:00:06 +0000 (11:00 -0800)]
Merge "Utils: correctly handle read() errors in ReadRandomBytes()" am:
a2bd436594
am:
038a274e8a
Change-Id: I64d09e4a3164749a915b079dcffe56940182a7d2
Eric Biggers [Tue, 22 Jan 2019 18:33:43 +0000 (10:33 -0800)]
Merge "cryptfs: check for errors in create_encrypted_random_key()"
am:
f156c40404
Change-Id: I67871c595dfeab96de3096e0bcf61c69261cb9cc
Eric Biggers [Tue, 22 Jan 2019 18:33:21 +0000 (10:33 -0800)]
Merge "Utils: correctly handle read() errors in ReadRandomBytes()"
am:
a2bd436594
Change-Id: If33693132dd4954135070c2681053a49f885ed0e
Eric Biggers [Tue, 22 Jan 2019 18:18:18 +0000 (18:18 +0000)]
Merge "cryptfs: check for errors in create_encrypted_random_key()"
Eric Biggers [Tue, 22 Jan 2019 18:14:49 +0000 (18:14 +0000)]
Merge "Utils: correctly handle read() errors in ReadRandomBytes()"
Sudheer Shanka [Wed, 9 Jan 2019 20:15:15 +0000 (12:15 -0800)]
Create a new MOUNT_EXTERNAL_LEGACY storage mode.
Apps that are already installed on the device before isolated_storage
feature is enabled will be granted MOUNT_EXTERNAL_LEGACY mode. In this
mode, /mnt/runtime/write will be mounted at /storage giving them same
level of access as in P.
A new mount directory /mnt/runtime/full is also created which will be
used for mounting at /storage for apps started with MOUNT_EXTERNAL_FULL
mode. This will allow apps with WRITE_MEDIA_STORAGE permission to
read/write anywhere on the secondary devices without needing to bypass
sdcardfs.
Bug:
121277410
Test: manual
Test: atest android.appsecurity.cts.ExternalStorageHostTest
Change-Id: Icc1ff9da35545692daedef7173d7c89290dd2766
Sudheer Shanka [Sat, 19 Jan 2019 01:46:05 +0000 (17:46 -0800)]
Merge "Create new mount directory /mnt/runtime/full." am:
b9fae464fc am:
f6c3c77f6c
am:
dbd9c5ccbe
Change-Id: I90827fdccc294641db0cecaaa523140e9cb9d0fd
Sudheer Shanka [Sat, 19 Jan 2019 01:16:42 +0000 (17:16 -0800)]
Merge "Create new mount directory /mnt/runtime/full." am:
b9fae464fc
am:
f6c3c77f6c
Change-Id: Idb4f70a870dbb5187170272e8d35cf45fc4ec8c4
Sudheer Shanka [Sat, 19 Jan 2019 00:52:45 +0000 (16:52 -0800)]
Merge "Create new mount directory /mnt/runtime/full."
am:
b9fae464fc
Change-Id: I33a72f65d938bfb3132b6440e5cd1d9e791600c6
Sudheer Shanka [Sat, 19 Jan 2019 00:24:23 +0000 (00:24 +0000)]
Merge "Create new mount directory /mnt/runtime/full."
Sudheer Shanka [Thu, 17 Jan 2019 07:35:49 +0000 (23:35 -0800)]
Create new mount directory /mnt/runtime/full.
This will be used for system internals to access
secondary volumes without having to bypass sdcardfs.
Bug:
121277410
Test: manual
Exempt-From-Owner-Approval: Got approval on internal master
Change-Id: I9b3e33f6c6e426e83469b8030b02d59c02183946
Jeff Sharkey [Fri, 18 Jan 2019 21:54:30 +0000 (21:54 +0000)]
Merge "Use "sys.isolated_storage_snapshot" prop to check for the feature."
Eric Biggers [Wed, 16 Jan 2019 21:05:34 +0000 (13:05 -0800)]
cryptfs: check for errors in create_encrypted_random_key()
When generating the key and salt we weren't checking for an error
opening or reading from /dev/urandom. Switch to the helper function
ReadRandomBytes() and start checking for errors.
Test: Booted device with FDE. As a extra sanity check I also
temporarily added log messages that dump the key and salt,
and I verified they still appear random.
Change-Id: I01ccee4f1f9910bf9508c8f02a918157393b0e68
Eric Biggers [Wed, 16 Jan 2019 21:05:34 +0000 (13:05 -0800)]
Utils: correctly handle read() errors in ReadRandomBytes()
read() returns -1 on error, so we need to use a signed type.
Test: Booted device with FDE
Change-Id: Ib44247c1cdfd38674a7439209e333823f2fb6cf8
Sudheer Shanka [Fri, 18 Jan 2019 15:42:55 +0000 (15:42 +0000)]
Merge "Update VolumeManager to use UnmountTreeWithPrefix."
Sudheer Shanka [Fri, 18 Jan 2019 01:20:47 +0000 (17:20 -0800)]
Use "sys.isolated_storage_snapshot" prop to check for the feature.
StorageManager.hasIsolatedStorage() has already been updated to use
this, so most callers are already using this sys prop. Now, updating
remaining callers to use it as well.
Bug:
122559151
Test: manual
Change-Id: I6982a84b737a1d329f397b8182b7b7cdc5a8897f
Sudheer Shanka [Thu, 17 Jan 2019 21:38:10 +0000 (13:38 -0800)]
Update VolumeManager to use UnmountTreeWithPrefix.
Bug:
122905493
Test: manual
Change-Id: Ia6aa1d400277a76dfd2c1db87c613d7e692b0b5c
Xin Li [Thu, 17 Jan 2019 22:19:21 +0000 (14:19 -0800)]
[automerger skipped] Merge "DO NOT MERGE - Skip pie-platform-release (PPRL.190105.001) in master" am:
9f7aa175a0 -s ours am:
e317e3d03b -s ours
am:
6653c9067a -s ours
am skip reason: subject contains skip directive
Change-Id: Icc02fbabc39fb2418322279a25fb4d1952743426
Xin Li [Thu, 17 Jan 2019 22:06:10 +0000 (14:06 -0800)]
[automerger skipped] Merge "DO NOT MERGE - Skip pie-platform-release (PPRL.190105.001) in master" am:
9f7aa175a0 -s ours
am:
e317e3d03b -s ours
am skip reason: subject contains skip directive
Change-Id: I25a393ce31a2b0e9d5cb2ec32db90aebd274c1d3
Xin Li [Thu, 17 Jan 2019 21:54:05 +0000 (13:54 -0800)]
[automerger skipped] Merge "DO NOT MERGE - Skip pie-platform-release (PPRL.190105.001) in master"
am:
9f7aa175a0 -s ours
am skip reason: subject contains skip directive
Change-Id: Ia43ba3dfaad4bc846241ac4dd57bd55e30a7bbad
Xin Li [Thu, 17 Jan 2019 21:19:43 +0000 (21:19 +0000)]
Merge "DO NOT MERGE - Skip pie-platform-release (PPRL.190105.001) in master"
Sudheer Shanka [Thu, 17 Jan 2019 18:53:57 +0000 (10:53 -0800)]
Merge "Add UnmountTreeWithPrefix util method." am:
2e9aafb620 am:
5e10de1301
am:
8bdc5e6de8
Change-Id: I0c3a14b70c07a6b97cb429350eda653f6fb5954a
Sudheer Shanka [Thu, 17 Jan 2019 18:39:07 +0000 (10:39 -0800)]
Merge "Add UnmountTreeWithPrefix util method." am:
2e9aafb620
am:
5e10de1301
Change-Id: I9d8f2350f41372b4ad3e037c440c8d922874c410
Sudheer Shanka [Thu, 17 Jan 2019 18:26:46 +0000 (10:26 -0800)]
Merge "Add UnmountTreeWithPrefix util method."
am:
2e9aafb620
Change-Id: Ifc0d514634e700875aa70d0e24952fc24780cb4d
Sudheer Shanka [Thu, 17 Jan 2019 18:04:27 +0000 (18:04 +0000)]
Merge "Add UnmountTreeWithPrefix util method."
Annie Meng [Thu, 17 Jan 2019 17:26:04 +0000 (09:26 -0800)]
Merge "Create subdirs in system_ce/ for multi-user backup" am:
625203444b am:
33a5634374
am:
2506860cfb
Change-Id: I116438108a176deb90eaf724ac8ddd66d597a129
Annie Meng [Thu, 17 Jan 2019 17:16:25 +0000 (09:16 -0800)]
Merge "Create subdirs in system_ce/ for multi-user backup" am:
625203444b
am:
33a5634374
Change-Id: I34ff23afb41fb25ec2df8cab5994663938407350
Annie Meng [Thu, 17 Jan 2019 17:10:57 +0000 (09:10 -0800)]
Merge "Create subdirs in system_ce/ for multi-user backup"
am:
625203444b
Change-Id: Ifb251a875ae2245254ff113c81cac8a9205daf17
Annie Meng [Thu, 17 Jan 2019 15:29:32 +0000 (15:29 +0000)]
Merge "Create subdirs in system_ce/ for multi-user backup"
Annie Meng [Wed, 16 Jan 2019 21:32:27 +0000 (21:32 +0000)]
Create subdirs in system_ce/ for multi-user backup
Backup system service bookkeeping is being moved to per-user CE
directories to support multiple users participating in the service.
Accompanies SELinux changes at aosp/873133
Bug:
121197420
Test: 1) Boot device; check dirs created with correct label; run backup
successfully on system user
2) Create secondary user; check dirs created with correct label; run
backup successfully
Change-Id: I3a0fdbfcf18a3c242fc64fba0dd014160b50b2f0
Annie Meng [Thu, 17 Jan 2019 11:20:35 +0000 (03:20 -0800)]
Merge "vold_prepare_subdirs: prepare /data/misc_[ce|de]/rollback." am:
3cc1866454 am:
2cc1d4e458
am:
142afc926f
Change-Id: Iddeb8e2722162edcd5929a9e9684d3c7fcfcd0ba
Annie Meng [Thu, 17 Jan 2019 11:13:25 +0000 (03:13 -0800)]
Merge "vold_prepare_subdirs: prepare /data/misc_[ce|de]/rollback." am:
3cc1866454
am:
2cc1d4e458
Change-Id: I06d27746ff0c3b406312e805df075f8373caf16e
Annie Meng [Thu, 17 Jan 2019 11:09:20 +0000 (03:09 -0800)]
Merge "vold_prepare_subdirs: prepare /data/misc_[ce|de]/rollback."
am:
3cc1866454
Change-Id: I1fe5887b2d4a0c222e95e594562f368587e069c5
Annie Meng [Thu, 17 Jan 2019 11:01:00 +0000 (11:01 +0000)]
Merge "vold_prepare_subdirs: prepare /data/misc_[ce|de]/rollback."
Sudheer Shanka [Thu, 17 Jan 2019 07:04:07 +0000 (23:04 -0800)]
Add UnmountTreeWithPrefix util method.
Add a utility method to unmount all mountpoints
that start with a prefix.
Bug:
122905493
Test: manual
Change-Id: I11739e40e7849c1b4ca9e0b90c5c3f243691257a
Paul Lawrence [Thu, 17 Jan 2019 02:06:18 +0000 (18:06 -0800)]
Merge "Checkpoints: Support validation and roll forward on fail" am:
9ff07121ff am:
aa4aa48be5
am:
c7c8ce19e1
Change-Id: I048286d22d4ec064a8128df89e56c8c731734437
Paul Lawrence [Thu, 17 Jan 2019 01:28:40 +0000 (17:28 -0800)]
Merge "Checkpoints: Support validation and roll forward on fail" am:
9ff07121ff
am:
aa4aa48be5
Change-Id: Iec1ad69b919371963bd21602e17a1e7a233af029
Paul Lawrence [Thu, 17 Jan 2019 01:17:13 +0000 (17:17 -0800)]
Merge "Checkpoints: Support validation and roll forward on fail"
am:
9ff07121ff
Change-Id: Ica199c67c5083a5fdb9d08331ff6b2560625fa0e
Treehugger Robot [Thu, 17 Jan 2019 01:08:20 +0000 (01:08 +0000)]
Merge "Checkpoints: Support validation and roll forward on fail"
Paul Lawrence [Tue, 20 Nov 2018 22:07:59 +0000 (14:07 -0800)]
Checkpoints: Support validation and roll forward on fail
Test: Rolls backward, and if you hexedit a BOW page, rolls forward
Change-Id: If99a6c3a3bc3f615bd1445f5af14ea490a58e053
Narayan Kamath [Mon, 14 Jan 2019 10:03:07 +0000 (10:03 +0000)]
vold_prepare_subdirs: prepare /data/misc_[ce|de]/rollback.
These directories are managed by installd and used to store
snapshots of application data directories in order to roll them
back in the case of bad updates.
Bug:
112431924
Test: make, device boot & manual verification.
Change-Id: Ieaca697a45d013937327e0f16f36b9b1eaad6b22
OSDN Git Service
