OSDN Git Service
Keun-young Park [Thu, 3 Aug 2017 18:24:04 +0000 (18:24 +0000)]
do not sleep if it is shutting down
am:
375ac25773
Change-Id: I576040b0068c27b9c7abd880e390841ce80f9906
Keun-young Park [Thu, 3 Aug 2017 00:45:48 +0000 (17:45 -0700)]
do not sleep if it is shutting down
- Various sleep(5) for vold shutdown can increase shutdown time a lot.
- If it is shutting down, do not sleep at all. init will take care of
active partitions if not unmounted.
bug:
64143519
Test: reboot and check logs from vold, check if "ShutdownThread: Shutdown wait timed out" happens.
Change-Id: I7cb91427ad2205fe23a054d255caf7ffdfd9f6c3
Pavel Grafov [Thu, 27 Jul 2017 16:34:57 +0000 (17:34 +0100)]
Drop inode and page caches after evicting CE key.
Bug:
63257991
Test: Turning work profile off and attempting to read profile files.
Change-Id: I36f8ae9a8894f88950f50aed4a06645fab7e998b
Jeff Sharkey [Mon, 17 Jul 2017 19:57:18 +0000 (13:57 -0600)]
Only enable quotas when supported by device.
Otherwise we might end up creating ext4 partitions that the device
can't mount.
Bug:
63763609
Test: builds, boots
Exempt-From-Owner-Approval: Bug
63673347
Change-Id: I5f6cf73f23a55bc0dea9480523f19049313c3dd1
TreeHugger Robot [Thu, 13 Jul 2017 21:05:07 +0000 (21:05 +0000)]
Merge "Check if sdcard daemon exited."
Junichi Uekawa [Thu, 13 Jul 2017 20:45:56 +0000 (20:45 +0000)]
Merge "Try SO_RCVBUF before SO_RCVBUFFORCE." am:
3f8fa0c215 am:
dfcc7dbad0 am:
602a2ce0e0
am:
189527f13f
Change-Id: Ie4cdfd04c1acf48c802b233eb34b2417c859ae04
Junichi Uekawa [Thu, 13 Jul 2017 20:37:17 +0000 (20:37 +0000)]
Merge "Try SO_RCVBUF before SO_RCVBUFFORCE." am:
3f8fa0c215 am:
dfcc7dbad0
am:
602a2ce0e0
Change-Id: I4d4946552edb444f4a3a7ea333f272a7408ec260
Junichi Uekawa [Thu, 13 Jul 2017 20:34:46 +0000 (20:34 +0000)]
Merge "Try SO_RCVBUF before SO_RCVBUFFORCE." am:
3f8fa0c215
am:
dfcc7dbad0
Change-Id: I742ebc5174d809fa6f70324659f6e03798710679
Junichi Uekawa [Thu, 13 Jul 2017 20:32:18 +0000 (20:32 +0000)]
Merge "Try SO_RCVBUF before SO_RCVBUFFORCE."
am:
3f8fa0c215
Change-Id: I5df611cfaa1c4451f4d0cd576f3b82f2fefbea6b
Treehugger Robot [Thu, 13 Jul 2017 20:21:49 +0000 (20:21 +0000)]
Merge "Try SO_RCVBUF before SO_RCVBUFFORCE."
Daniel Rosenberg [Wed, 12 Jul 2017 00:59:55 +0000 (17:59 -0700)]
Check if sdcard daemon exited.
If the system is using sdcardfs, the sdcard daemon exits after mounting.
If it's using FUSE, the sdcard daemon runs until we go to unmount.
Bug:
37638548
Test: Run "adb shell ps | grep -w Z" with sdcardfs enabled.
The sdcard daemon should not be listed.
Run again with sdcardfs disabled. The daemon should be
running, and vold should not be stuck waiting on it.
Change-Id: I930d22b35194ec99e7a6a4a022a04d36f4f39a34
Junichi Uekawa [Wed, 4 Nov 2015 21:05:54 +0000 (06:05 +0900)]
Try SO_RCVBUF before SO_RCVBUFFORCE.
When running in a container, the process might be in a user/net
namespace, which would cause setting the SO_RCVBUFFORCE socket option to
fail with EPERM. But rmem_max is set to a high enough value which allows
SO_RCVBUF to succeed.
Bug:
62417946
Test: Run android in a new user and network namespace, vold does not
abort here.
Change-Id: I2b678ddd886a406a3394d9fdd33f9c8800ef78a3
Signed-off-by: Junichi Uekawa <uekawa@google.com>
(cherry picked from commit
b41155d4af0e00fc6f65d7d67b80e7b866f847d6)
Keun-young Park [Thu, 6 Jul 2017 17:24:53 +0000 (17:24 +0000)]
add vold to "shutdown critical" am:
85f412b4ee
am:
4f58be1b69
Change-Id: I05a8c1ddb479e4e7527ef5d593a75f6a5992a5ad
Keun-young Park [Thu, 6 Jul 2017 17:22:35 +0000 (17:22 +0000)]
add vold to "shutdown critical"
am:
85f412b4ee
Change-Id: Ib346b39be455571656c4732d2ad63b3edbe1e0cd
Android Build Merger (Role) [Thu, 6 Jul 2017 01:40:02 +0000 (01:40 +0000)]
Merge "Merge "Merge "add vold to "shutdown critical"" am:
da85cb71b3 am:
228b95fa15 am:
733fe09928" into oc-dr1-dev-plus-aosp am:
f39281b68c"
Android Build Merger (Role) [Thu, 6 Jul 2017 01:39:56 +0000 (01:39 +0000)]
Merge "Merge "Merge "add vold to "shutdown critical"" am:
da85cb71b3 am:
228b95fa15 am:
733fe09928" into oc-dr1-dev-plus-aosp am:
f39281b68c"
Keun-young Park [Thu, 6 Jul 2017 01:39:32 +0000 (01:39 +0000)]
Merge "Merge "add vold to "shutdown critical"" am:
da85cb71b3 am:
228b95fa15 am:
733fe09928" into oc-dr1-dev-plus-aosp
am:
f39281b68c
Change-Id: I142be6c019cd9a3f8f212a2bbc97842cd04cf6eb
Keun-young Park [Thu, 6 Jul 2017 01:39:27 +0000 (01:39 +0000)]
Merge "Merge "add vold to "shutdown critical"" am:
da85cb71b3 am:
228b95fa15 am:
733fe09928" into oc-dr1-dev-plus-aosp
am:
f39281b68c
Change-Id: If9b0ee31633ae73ad9257ee6035bdb1bd3c3d861
Android Build Merger (Role) [Thu, 6 Jul 2017 01:38:55 +0000 (01:38 +0000)]
Merge "Merge "add vold to "shutdown critical"" am:
da85cb71b3 am:
228b95fa15 am:
733fe09928 am:
9045c86a32"
Keun-young Park [Thu, 6 Jul 2017 01:38:24 +0000 (01:38 +0000)]
Merge "add vold to "shutdown critical"" am:
da85cb71b3 am:
228b95fa15 am:
733fe09928
am:
9045c86a32
Change-Id: I5440cec7c057e5bc5e40886fcedd1a4814fd063a
Keun-young Park [Thu, 6 Jul 2017 01:38:18 +0000 (01:38 +0000)]
Merge "add vold to "shutdown critical"" am:
da85cb71b3 am:
228b95fa15 am:
733fe09928
am:
9045c86a32
Change-Id: Ifa4795f87e6de808cbbf4e238d8a0a938ad1f8b9
Android Build Merger (Role) [Thu, 6 Jul 2017 01:14:00 +0000 (01:14 +0000)]
Merge "Merge "add vold to "shutdown critical"" am:
da85cb71b3 am:
228b95fa15 am:
733fe09928" into oc-dr1-dev-plus-aosp
Keun-young Park [Thu, 6 Jul 2017 01:13:30 +0000 (01:13 +0000)]
Merge "add vold to "shutdown critical"" am:
da85cb71b3 am:
228b95fa15
am:
733fe09928
Change-Id: I123056823f31b7e8d0ad3a6ae7775867d3dd0edb
Keun-young Park [Thu, 6 Jul 2017 01:13:21 +0000 (01:13 +0000)]
Merge "add vold to "shutdown critical"" am:
da85cb71b3 am:
228b95fa15
am:
733fe09928
Change-Id: I760a1278d3138ca7a24ab69613466c83615f067d
Keun-young Park [Thu, 6 Jul 2017 00:56:21 +0000 (00:56 +0000)]
Merge "add vold to "shutdown critical"" am:
da85cb71b3
am:
228b95fa15
Change-Id: I0de967657d969f54dedddbb2b72ab07ed650e2e3
Keun-young Park [Wed, 5 Jul 2017 18:58:32 +0000 (11:58 -0700)]
add vold to "shutdown critical"
bug:
37626581
Test: reboot and check last kmsg
(cherry picked from commit
41156c5035efb4aa5212963ac028b7889feda3f8)
Change-Id: I363dbbe58d2cb46b521ebdcea85c507679f27206
Keun-young Park [Thu, 6 Jul 2017 00:46:34 +0000 (00:46 +0000)]
Merge "add vold to "shutdown critical""
am:
da85cb71b3
Change-Id: Ib0e4977590a94d7934001c223677cff45e59cd0a
Treehugger Robot [Thu, 6 Jul 2017 00:40:55 +0000 (00:40 +0000)]
Merge "add vold to "shutdown critical""
Keun-young Park [Wed, 5 Jul 2017 18:58:32 +0000 (11:58 -0700)]
add vold to "shutdown critical"
bug:
37626581
Test: reboot and check last kmsg
Change-Id: I2c186c20a4afc342eaae420175013c80219a5ee5
Paul Crowley [Thu, 29 Jun 2017 01:20:07 +0000 (01:20 +0000)]
resolve merge conflicts of
8e6f6a5 to oc-dr1-dev-plus-aosp
am:
071120776a
Change-Id: Ifaa55b09cf0251cf994b8870169cf69e430b91ba
Paul Crowley [Wed, 28 Jun 2017 23:08:04 +0000 (16:08 -0700)]
resolve merge conflicts of
8e6f6a5 to oc-dr1-dev-plus-aosp
Test: None
Change-Id: Icf7654b3200a4afd104f31aff8ce5b09867b7182
Paul Crowley [Wed, 28 Jun 2017 22:45:50 +0000 (22:45 +0000)]
resolve merge conflicts of
4ad7784 to stage-aosp-master
am:
ddb542f574
Change-Id: Iedef223a14b8a0c8dc558440b429a33d6b23f948
Paul Crowley [Tue, 27 Jun 2017 16:33:39 +0000 (09:33 -0700)]
resolve merge conflicts of
4ad7784 to stage-aosp-master
Test: Build seems to be unrelatedly broken
Change-Id: I2df307aa1c7134f217c558495e1438412480f324
Merged-In: I6ccfe0894551ba068de9bf5e23fe4fd1e10e36b1
Treehugger Robot [Tue, 27 Jun 2017 16:17:20 +0000 (16:17 +0000)]
Merge "Label keys with all the possible FBE prefixes that might apply"
TreeHugger Robot [Tue, 27 Jun 2017 02:10:57 +0000 (02:10 +0000)]
Merge "Fully switch to mke2fs; set policies everywhere."
TreeHugger Robot [Tue, 27 Jun 2017 00:50:30 +0000 (00:50 +0000)]
Merge "Label keys with all the possible FBE prefixes that might apply"
Jeff Sharkey [Mon, 26 Jun 2017 22:09:11 +0000 (16:09 -0600)]
Fully switch to mke2fs; set policies everywhere.
Older make_ext4fs doesn't support enabling quotas, so switch everyone
over to using mke2fs for adoptable storage.
Remove UUID check so that we start setting ext4-crypto policies on
adoptable storage devices; a future change will handle the actual
key management.
Bug:
30230655,
36757864
Test: cts-tradefed run commandAndExit cts-dev --abi armeabi-v7a -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.AdoptableHostTest
Change-Id: I021f85b1be8431044c239521c37be96534682746
Paul Crowley [Mon, 19 Jun 2017 23:05:55 +0000 (16:05 -0700)]
Label keys with all the possible FBE prefixes that might apply
We don't know which FS and kernel version is going to want these keys,
so put them in the kernel three times with all three possible prefixes.
Bug:
62900873
Test: Marlin set up before this change successfully boots after it.
Change-Id: I6ccfe0894551ba068de9bf5e23fe4fd1e10e36b1
Jeff Sharkey [Wed, 21 Jun 2017 19:52:23 +0000 (13:52 -0600)]
Progress towards FBE and adoptable storage.
Offer to adopt storage devices on FBE devices, but keep it guarded
behind a system property for now, since we still need to work out key
storage details.
When migrating shared storage, leave user-specific /data/media
directories in place, since they already have the needed crypto
policies defined.
Enable journaling, quotas, and encrypt options when formatting
newly adopted devices. installd already gracefully handles older
partitions without quota enabled.
Test: cts-tradefed run commandAndExit cts-dev --abi armeabi-v7a -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.AdoptableHostTest
Bug:
62290006,
36757864,
29117062,
37395736
Bug:
29923055,
25861755,
30230655,
37436961
Change-Id: Ibbeb6ec9db2394a279bbac221a2b20711d65494e
Paul Crowley [Mon, 19 Jun 2017 23:05:55 +0000 (16:05 -0700)]
Label keys with all the possible FBE prefixes that might apply
We don't know which FS and kernel version is going to want these keys,
so put them in the kernel three times with all three possible prefixes.
Test: Marlin set up before this change successfully boots after it.
Change-Id: I6ccfe0894551ba068de9bf5e23fe4fd1e10e36b1
Jaegeuk Kim [Mon, 5 Jun 2017 17:22:04 +0000 (10:22 -0700)]
cryptfs: call format_f2fs correctly with proper flags
Change-Id: Ia493e6f758ff5dd5dd41479193ab237d4306d464
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Paul Crowley [Mon, 19 Jun 2017 19:46:30 +0000 (19:46 +0000)]
Merge "Move functions useful for crypto test into their own file"
Paul Crowley [Mon, 19 Jun 2017 15:33:59 +0000 (15:33 +0000)]
Merge "Abolish AutoCloseFD.h in favour of unique_fd"
Paul Crowley [Fri, 16 Jun 2017 16:37:31 +0000 (09:37 -0700)]
Move functions useful for crypto test into their own file
More refactoring in advance of work on bug.
Bug:
36029169
Test: compiles.
Change-Id: Ic4cdd4761e4c2b11a3ddca5c3bbc4d5e42fac9d4
Paul Crowley [Fri, 16 Jun 2017 16:21:18 +0000 (09:21 -0700)]
Abolish AutoCloseFD.h in favour of unique_fd
Android has a standard way to do what AutoCloseFD.h does, so use that
instead. Refactor before work on the bug.
Bug:
36029169
Test: Deleted a user and checked that secdiscard logs looked good.
Change-Id: I5d8bedfb3fa1f032fd2bced88b1b561e4a8c2ff4
Tom Cherry [Fri, 16 Jun 2017 06:05:13 +0000 (06:05 +0000)]
Merge "Use WaitForProperty() to wait for restorecon" am:
963a205a1b am:
80ce34d6cb am:
dfd0492354
am:
bd40570e25
Change-Id: I8cf81bab9521b3d0a589943a0a5dbd815aa75b5c
Tom Cherry [Fri, 16 Jun 2017 06:01:26 +0000 (06:01 +0000)]
Merge "Use WaitForProperty() to wait for restorecon" am:
963a205a1b am:
80ce34d6cb
am:
dfd0492354
Change-Id: Id3b68e5b946fc1bf886f59e59fee3960a2899041
Tom Cherry [Fri, 16 Jun 2017 05:57:12 +0000 (05:57 +0000)]
Merge "Use WaitForProperty() to wait for restorecon" am:
963a205a1b
am:
80ce34d6cb
Change-Id: I4687810672b51db024f11ad7976562d510de9b81
Tom Cherry [Fri, 16 Jun 2017 05:53:12 +0000 (05:53 +0000)]
Merge "Use WaitForProperty() to wait for restorecon"
am:
963a205a1b
Change-Id: I4a11f21c0849922cda49e3f771a0b0dcfc5a3177
Treehugger Robot [Fri, 16 Jun 2017 05:47:51 +0000 (05:47 +0000)]
Merge "Use WaitForProperty() to wait for restorecon"
Tom Cherry [Fri, 16 Jun 2017 00:13:56 +0000 (17:13 -0700)]
Use WaitForProperty() to wait for restorecon
We have android::base::WaitForProperty() that uses futexes to
efficiently wait for property value changes, so use that instead
polling.
Test: Boot bullhead
Change-Id: Id964eddbdbfd9b5ceac5ed83a8ed66b9e60008ca
Chih-Hung Hsieh [Sat, 10 Jun 2017 00:01:23 +0000 (00:01 +0000)]
Merge "Add OWNERS in system/vold" am:
f18a5aad56 am:
db09dbafdd am:
c8240e2dd3
am:
b413703a3b
Change-Id: I4d56fd159f08f63c577b2f7ac075e6adba815b9b
Chih-Hung Hsieh [Fri, 9 Jun 2017 23:47:05 +0000 (23:47 +0000)]
Merge "Add OWNERS in system/vold" am:
f18a5aad56 am:
db09dbafdd
am:
c8240e2dd3
Change-Id: Ie400e5a087a11670ea2f46b2056dd9a659d01317
Chih-Hung Hsieh [Fri, 9 Jun 2017 23:44:39 +0000 (23:44 +0000)]
Merge "Add OWNERS in system/vold" am:
f18a5aad56
am:
db09dbafdd
Change-Id: I78c4e90025a9b2785fff5955a5ece7bc5e866bd0
Chih-Hung Hsieh [Fri, 9 Jun 2017 23:42:34 +0000 (23:42 +0000)]
Merge "Add OWNERS in system/vold"
am:
f18a5aad56
Change-Id: I75b04fc9a4e8d2e5de49833893ba74a375130929
Treehugger Robot [Fri, 9 Jun 2017 23:38:00 +0000 (23:38 +0000)]
Merge "Add OWNERS in system/vold"
Chih-Hung Hsieh [Fri, 9 Jun 2017 21:55:46 +0000 (14:55 -0700)]
Add OWNERS in system/vold
* Owners are selected from top CL approvals or owners.
They will be suggested to review/approve future CLs.
* OWNERS files are recognized by the new find-owners plugin, see .md files in
https://gerrit.googlesource.com/plugins/find-owners/+/master/src/main/resources/Documentation/
Test: build/make/tools/checkowners.py -c -v OWNERS
Change-Id: I4d0431105b55e88be258800a7fd45a42deb9bb60
Wei Wang [Wed, 7 Jun 2017 17:46:12 +0000 (10:46 -0700)]
Remove timout logic in waiting vold.post_fs_data_done
This code should not be timing out, since it has no graceful way to
recover.
Bug:
62308812
Test: marlin boot
Change-Id: I1284f9a34e83e6451622a702d2bee40b08877db2
Elliott Hughes [Fri, 19 May 2017 19:01:20 +0000 (19:01 +0000)]
Merge "vold should #include <sys/sysmacros.h>" am:
398c0e8274 am:
208b464f72 am:
fb3e85cf99
am:
048422d46e
Change-Id: I33406265fcf0c77a6289cb429aa6a2cc5e8f7146
Elliott Hughes [Fri, 19 May 2017 18:38:38 +0000 (18:38 +0000)]
Merge "vold should #include <sys/sysmacros.h>" am:
398c0e8274 am:
208b464f72
am:
fb3e85cf99
Change-Id: I32ed2a66bb60ba1042737b4bbb0a2195a3fe8e6f
Elliott Hughes [Fri, 19 May 2017 18:36:39 +0000 (18:36 +0000)]
Merge "vold should #include <sys/sysmacros.h>" am:
398c0e8274
am:
208b464f72
Change-Id: I8d4a8069958bc4af67766fde101c322b2f189049
Elliott Hughes [Fri, 19 May 2017 18:34:45 +0000 (18:34 +0000)]
Merge "vold should #include <sys/sysmacros.h>"
am:
398c0e8274
Change-Id: Id72168cac260fedc3123e28402f737ee8be3f625
Treehugger Robot [Fri, 19 May 2017 18:30:44 +0000 (18:30 +0000)]
Merge "vold should #include <sys/sysmacros.h>"
Elliott Hughes [Thu, 18 May 2017 16:08:24 +0000 (09:08 -0700)]
vold should #include <sys/sysmacros.h>
Bug: https://github.com/android-ndk/ndk/issues/398
Test: builds
Change-Id: I7a1ca1701099886fb493cc5288d6ee867d5f520a
Rubin Xu [Tue, 16 May 2017 16:48:23 +0000 (16:48 +0000)]
Add secdiscard command for secure deletion of files am:
f8d604caf3
am:
f572398ae6 -s ours
Change-Id: Ic9960602cac03407caa8f63e4f0c9913640db5d2
Rubin Xu [Tue, 16 May 2017 16:35:19 +0000 (16:35 +0000)]
Add secdiscard command for secure deletion of files
am:
f8d604caf3
Change-Id: Ib9d71507b880ee8dc66880536c800212f523332d
Rubin Xu [Thu, 27 Apr 2017 19:43:10 +0000 (20:43 +0100)]
Add secdiscard command for secure deletion of files
This is used by LockSettingsService to delete sensitive credential files.
Bug:
34600579
Test: manual - change device lock under synthetic password, verify
old data on disk is erased.
Change-Id: I5e11b559ad8818bd2ad2b321d67d21477aab7555
Merged-In: I5e11b559ad8818bd2ad2b321d67d21477aab7555
Rubin Xu [Thu, 27 Apr 2017 19:43:10 +0000 (20:43 +0100)]
Add secdiscard command for secure deletion of files
This is used by LockSettingsService to delete sensitive credential files.
Bug:
34600579
Test: manual - change device lock under synthetic password, verify
old data on disk is erased.
Change-Id: I5e11b559ad8818bd2ad2b321d67d21477aab7555
Elliott Hughes [Sat, 13 May 2017 00:48:26 +0000 (00:48 +0000)]
Merge "Switch to libkeyutils." am:
612eea6b4f am:
7a7df78819 am:
f727d05b83
am:
4e19ff7ab1
Change-Id: Iff35b18579b3f7e932d36ed2164fd49b7791f779
Elliott Hughes [Sat, 13 May 2017 00:44:18 +0000 (00:44 +0000)]
Merge "Switch to libkeyutils." am:
612eea6b4f am:
7a7df78819
am:
f727d05b83
Change-Id: I1b3e4e932e54b33dd582a849135822ace61c11d7
Elliott Hughes [Sat, 13 May 2017 00:34:10 +0000 (00:34 +0000)]
Merge "Switch to libkeyutils." am:
612eea6b4f
am:
7a7df78819
Change-Id: I05f95589668e93b36d5d5eed2c4ac21aff6f7e41
Elliott Hughes [Sat, 13 May 2017 00:32:13 +0000 (00:32 +0000)]
Merge "Switch to libkeyutils."
am:
612eea6b4f
Change-Id: Icb86bc1c341ec9366f382985522b6ec70e11b8ea
Elliott Hughes [Sat, 13 May 2017 00:28:25 +0000 (00:28 +0000)]
Merge "Switch to libkeyutils."
Elliott Hughes [Thu, 11 May 2017 17:38:14 +0000 (17:38 +0000)]
Merge "Switch to libkeyutils."
TreeHugger Robot [Thu, 11 May 2017 01:46:52 +0000 (01:46 +0000)]
Merge "Add CryptfsScryptHidlizationEquivalenceTest"
Elliott Hughes [Wed, 10 May 2017 00:01:04 +0000 (17:01 -0700)]
Switch to libkeyutils.
Bug: http://b/
37991155
Test: builds+boots
Change-Id: I33a3ba0d59ffd504093dc94517815c1196e95e2b
Elliott Hughes [Wed, 10 May 2017 00:01:04 +0000 (17:01 -0700)]
Switch to libkeyutils.
Bug: http://b/
37991155
Test: builds+boots
Change-Id: I33a3ba0d59ffd504093dc94517815c1196e95e2b
Tom Cherry [Thu, 4 May 2017 00:01:13 +0000 (00:01 +0000)]
Merge "BuildDataUserCePath always use dir instead of symbolic link" am:
fed8ab1d76 am:
7dc93304c8 am:
10211d2207
am:
3559234cd3
Change-Id: Ifc6196804b57bdf9d38a37d594281ef53623f0d3
Tom Cherry [Wed, 3 May 2017 23:54:25 +0000 (23:54 +0000)]
Merge "BuildDataUserCePath always use dir instead of symbolic link" am:
fed8ab1d76 am:
7dc93304c8
am:
10211d2207
Change-Id: I8ab5875455abaaa84cc777a96be23cbad314d3f7
Tom Cherry [Wed, 3 May 2017 23:51:53 +0000 (23:51 +0000)]
Merge "BuildDataUserCePath always use dir instead of symbolic link" am:
fed8ab1d76
am:
7dc93304c8
Change-Id: I025e83bc54bcda6e1a947301479bdd79d5a17e7b
Tom Cherry [Wed, 3 May 2017 23:46:52 +0000 (23:46 +0000)]
Merge "BuildDataUserCePath always use dir instead of symbolic link"
am:
fed8ab1d76
Change-Id: I98b7b11905f94c6576c268cfe950ed092b5e74d8
Tom Cherry [Wed, 3 May 2017 23:42:58 +0000 (23:42 +0000)]
Merge "BuildDataUserCePath always use dir instead of symbolic link"
Steven Moreland [Tue, 2 May 2017 19:26:43 +0000 (19:26 +0000)]
Keymaster: IWYU
am:
8264033678
Change-Id: Ia58e5508a19c4ba516a840e5f5287bfa1cb31bd1
Steven Moreland [Mon, 1 May 2017 19:45:32 +0000 (12:45 -0700)]
Keymaster: IWYU
Was depending on this transitively from MQDescriptor.h
Test: links
Bug:
37791060
Change-Id: I9b52bbe9ac6c3a54fdb6e352e90eba50914633d4
(cherry picked from commit
25e8b4b4f67f62a98c440f8323eaeb956d99f0cd)
Steven Moreland [Mon, 1 May 2017 19:45:32 +0000 (12:45 -0700)]
Keymaster: IWYU
Was depending on this transitively from MQDescriptor.h
Test: links
Bug:
37791060
Change-Id: I9b52bbe9ac6c3a54fdb6e352e90eba50914633d4
Daniel Rosenberg [Sun, 30 Apr 2017 12:00:35 +0000 (12:00 +0000)]
Merge "Revert "Revert "Stop dropping caches now we have kernel fix""" into oc-dev am:
c40996e719
am:
0066d41edd -s ours
Change-Id: Ic762430d6e04de38d0cc08846774d2e7604eaf41
Daniel Rosenberg [Sun, 30 Apr 2017 11:58:06 +0000 (11:58 +0000)]
Merge "Revert "Revert "Stop dropping caches now we have kernel fix""" into oc-dev
am:
c40996e719
Change-Id: If30418cbb9af2e9d81b944474483c8040845c12d
TreeHugger Robot [Sun, 30 Apr 2017 11:53:22 +0000 (11:53 +0000)]
Merge "Revert "Revert "Stop dropping caches now we have kernel fix""" into oc-dev
TreeHugger Robot [Sat, 29 Apr 2017 22:57:53 +0000 (22:57 +0000)]
Merge "Revert "Revert "Stop dropping caches now we have kernel fix"""
Guang Zhu [Sat, 29 Apr 2017 00:01:34 +0000 (00:01 +0000)]
Merge "Revert "Enable metadata encryption""
Guang Zhu [Fri, 28 Apr 2017 23:56:45 +0000 (23:56 +0000)]
Revert "Enable metadata encryption"
Bug:
37792477
This reverts commit
3963b2364561a7d732995d5b8fec42097f548caa.
Change-Id: I3b6bf5a9a4c3899aabe2c824d8498a06981daed8
Daniel Rosenberg [Fri, 28 Apr 2017 01:11:35 +0000 (01:11 +0000)]
Revert "Revert "Stop dropping caches now we have kernel fix""
This reverts commit
8ad0bef7b5b1b6e1ba3afe441d2dcc9a06e782a7.
Bug:
37231161
Test: Boot device with FBE enabled. ls /storage/emulated/0/Android
Unlock device. ls /storage/emulated/0/Android
1st will not be found. Second should be found.
Change-Id: I92c7ad0adaa7bd357e10661a47cc667ac0ff84b4
Merged-In: I92c7ad0adaa7bd357e10661a47cc667ac0ff84b4
Daniel Rosenberg [Fri, 28 Apr 2017 01:11:35 +0000 (01:11 +0000)]
Revert "Revert "Stop dropping caches now we have kernel fix""
This reverts commit
8ad0bef7b5b1b6e1ba3afe441d2dcc9a06e782a7.
Bug:
37231161
Test: Boot device with FBE enabled. ls /storage/emulated/0/Android
Unlock device. ls /storage/emulated/0/Android
1st will not be found. Second should be found.
Change-Id: I92c7ad0adaa7bd357e10661a47cc667ac0ff84b4
Nick Desaulniers [Fri, 28 Apr 2017 21:29:28 +0000 (21:29 +0000)]
Merge "Enable metadata encryption"
Paul Lawrence [Tue, 25 Apr 2017 16:26:56 +0000 (09:26 -0700)]
Enable metadata encryption
Bug:
26778031
Test: Boots, reboots, sector 0 of userdata encrypted
Make sure an FDE device, both default and password protected,
boots.
Make sure an FBE device without metadata encryption boots.
Change-Id: Ic44a32ce7e9b978e9c9e2dc112b26206741c838d
Yong Yao [Wed, 26 Apr 2017 21:36:03 +0000 (21:36 +0000)]
Fix keyname generation issue am:
392c4dbdc1
am:
b8bb4463e0 -s ours
Change-Id: I20283d6cc9576af54b0bfc9e2adaf0e1bfabcee7
Yong Yao [Wed, 26 Apr 2017 21:05:18 +0000 (21:05 +0000)]
Fix keyname generation issue
am:
392c4dbdc1
Change-Id: Iea048673c82dea1d5d9a13a10e1f70376955ca4b
Paul Crowley [Thu, 2 Jun 2016 18:04:27 +0000 (11:04 -0700)]
Add support for metadata encryption
Support encrypting metadata in /userdata using the dm-default-key
driver with a key in the /metadata partition.
Bug:
29189559
Test: Angler & Marlin build and boot
Change-Id: I716b117508d4bb4f6a4039293acb848cbc60f67b
Yong Yao [Wed, 5 Apr 2017 09:52:48 +0000 (05:52 -0400)]
Fix keyname generation issue
The keyname binded to keyring return a wrong string when there are binary char larger than 127,
the sign extension will introduce unexpect FFFFFF string to the keyname.
Bug:
36975893
Test: local build
Change-Id: Iba2f6ef95aeacd08c8d6c72b71e7b92e956ec3fc
Signed-off-by: Ai, Ting A <ting.a.ai@intel.com>
Paul Crowley [Thu, 2 Jun 2016 18:01:19 +0000 (11:01 -0700)]
Refactor to lay the groundwork for metadata encryption
Bug:
26778031
Test: Angler, Marlin build and boot
Change-Id: Ic136dfe6195a650f7db76d3489f36da6a1929dc5
OSDN Git Service
