OSDN Git Service
Wei Wang [Wed, 7 Sep 2016 17:58:40 +0000 (17:58 +0000)]
Update fs_mgr_mount_all function am:
84c985e275
am:
c3c04acae6
Change-Id: Iaf67826394328097426ea9ee605ec2908f67ebec
Wei Wang [Wed, 7 Sep 2016 17:53:30 +0000 (17:53 +0000)]
Update fs_mgr_mount_all function
am:
84c985e275
Change-Id: Ia2d7410d092d7569c8f8873a101140db9320c019
Wei Wang [Tue, 6 Sep 2016 20:21:07 +0000 (20:21 +0000)]
Merge "Update fs_mgr_mount_all function" am:
1d58bcf6d4 am:
554d8679e7
am:
02a52f1f10
Change-Id: Ie242ec19217b81a76dd3fd046ff8157bd3691381
Wei Wang [Tue, 6 Sep 2016 20:18:06 +0000 (20:18 +0000)]
Merge "Update fs_mgr_mount_all function" am:
1d58bcf6d4
am:
554d8679e7
Change-Id: Id6a99695c437c37b60e8e03eff9ff60eb91707a0
Wei Wang [Tue, 6 Sep 2016 20:14:37 +0000 (20:14 +0000)]
Merge "Update fs_mgr_mount_all function"
am:
1d58bcf6d4
Change-Id: Ic0c4c94cc6432d42229b9f66d95ea64cd49fa5f6
Wei Wang [Tue, 6 Sep 2016 20:05:57 +0000 (20:05 +0000)]
Merge "Update fs_mgr_mount_all function"
Wei Wang [Fri, 26 Aug 2016 03:58:37 +0000 (20:58 -0700)]
Update fs_mgr_mount_all function
This is part of the change to support early/late fstab mounting in order
to support starting key services before /data mounting
fs_mgr_mount_all function updated with a parameter to support mounting mode
More information refer to init/readme.txt
(cherry picked from commit
1d6476c3c848ebc8fbdfa6945e1c3be447beb5a3)
Bug:
30118894
Change-Id: I5e925b900fd477f230a90514cc2b561c7a7e9f49
Wei Wang [Fri, 26 Aug 2016 03:58:37 +0000 (20:58 -0700)]
Update fs_mgr_mount_all function
This is part of the change to support early/late fstab mounting in order
to support starting key services before /data mounting
fs_mgr_mount_all function updated with a parameter to support mounting mode
More information refer to init/readme.txt
(cherry picked from commit
1d6476c3c848ebc8fbdfa6945e1c3be447beb5a3)
Bug:
30118894
Change-Id: I5e925b900fd477f230a90514cc2b561c7a7e9f49
Jeff Sharkey [Wed, 31 Aug 2016 23:56:45 +0000 (23:56 +0000)]
DO NOT MERGE. Block adoptable storage when using FBE. am:
84be704af4
am:
1fbe38f424
Change-Id: I7331a05a5d40d8cf1d946971e86097e716580094
Jeff Sharkey [Wed, 31 Aug 2016 23:35:13 +0000 (23:35 +0000)]
DO NOT MERGE. Block adoptable storage when using FBE.
am:
84be704af4
Change-Id: If12088f04915fb4e7c239a7d0d90aa945183611d
Jeff Sharkey [Tue, 23 Aug 2016 19:48:50 +0000 (13:48 -0600)]
DO NOT MERGE. Block adoptable storage when using FBE.
For adoptable storage and FBE to coexist we need a new dm-biocrypt
kernel feature which isn't ready yet. So for now, prevent devices
from being adopted on FBE devices.
Bug:
30770036
Change-Id: I47639209161ee403ce13ea9a60da235e97c3fc30
(cherry picked from commit
157175110948b3cf604e40420059aa5265039847)
Chih-Hung Hsieh [Tue, 2 Aug 2016 20:37:24 +0000 (20:37 +0000)]
Merge "Fix google-explicit-constructor warnings in system/vold." am:
a3bcf26d93 am:
9bf2a320e7
am:
1c1c4edb98
Change-Id: I0493425398506c29c364965eb20e45cdaa1f9f1f
Chih-Hung Hsieh [Tue, 2 Aug 2016 20:34:51 +0000 (20:34 +0000)]
Merge "Fix google-explicit-constructor warnings in system/vold." am:
a3bcf26d93
am:
9bf2a320e7
Change-Id: I8e1288bd16b8a1c968d890412b5d1bdf03e9ae7a
Chih-Hung Hsieh [Tue, 2 Aug 2016 20:32:22 +0000 (20:32 +0000)]
Merge "Fix google-explicit-constructor warnings in system/vold."
am:
a3bcf26d93
Change-Id: I109b4e68954de019827eddca2001f4bcac91130d
Treehugger Robot [Tue, 2 Aug 2016 20:20:57 +0000 (20:20 +0000)]
Merge "Fix google-explicit-constructor warnings in system/vold."
Chih-Hung Hsieh [Tue, 2 Aug 2016 18:41:54 +0000 (11:41 -0700)]
Fix google-explicit-constructor warnings in system/vold.
Bug:
28341362
Change-Id: I14344b0cba134570bf87e7d61aa03503735dd794
Test: build with WITH_TIDY=1
Chih-Hung Hsieh [Thu, 28 Jul 2016 00:30:43 +0000 (00:30 +0000)]
Merge \\\"Fix clang-tidy performance warnings in system/vold.\\\" am:
e24d4eef9b am:
aa668f3d13
am:
ed1c4cf456
Change-Id: I345cfce27a2b20048953d85bb2dd39adc34190d8
Chih-hung Hsieh [Wed, 27 Jul 2016 23:20:23 +0000 (23:20 +0000)]
Merge \\"Fix clang-tidy performance warnings in system/vold.\\" am:
e24d4eef9b
am:
aa668f3d13
Change-Id: I7f175785ab17ad9107bd11e9cd4ff0a9a7cbd460
Chih-Hung Hsieh [Wed, 27 Jul 2016 23:17:57 +0000 (23:17 +0000)]
Merge \"Fix clang-tidy performance warnings in system/vold.\"
am:
e24d4eef9b
Change-Id: I8e882391fb343a5dd8b5cd32b2e7c087219334dc
Chih-hung Hsieh [Wed, 27 Jul 2016 22:42:50 +0000 (22:42 +0000)]
Merge "Fix clang-tidy performance warnings in system/vold."
Chih-Hung Hsieh [Wed, 27 Jul 2016 21:11:02 +0000 (14:11 -0700)]
Fix clang-tidy performance warnings in system/vold.
* Use const reference type for for-loop index variables
to avoid unnecessary copy.
Bug:
30413223
Change-Id: Id4d980ae8afec1374fc3be0b23f1c6a39bff86e0
Test: build with WITH_TIDY=1
Paul Crowley [Tue, 26 Jul 2016 16:32:36 +0000 (16:32 +0000)]
Don\'t try to fixate CE keys for ephemeral users
am:
25a713873c
Change-Id: I7ecf1fcc6763943c124a93c433f49274579851ae
Paul Crowley [Mon, 25 Jul 2016 22:55:36 +0000 (15:55 -0700)]
Don't try to fixate CE keys for ephemeral users
Ephemeral users don't have keys stored on disk at all, so it's neither
necessary nor possible to manipulate the disk keys here.
Bug:
30038313
Change-Id: Idc7ec1bfe1e8a6ffa6cee2f284dbe378097b08da
Paul Crowley [Fri, 22 Jul 2016 16:50:31 +0000 (16:50 +0000)]
Don\'t fail if a key we want to delete is already deleted
am:
ab0b56aef3
Change-Id: I08920a3e330443e7466f0acc924cd21dbebba4c4
Paul Crowley [Tue, 19 Jul 2016 22:29:53 +0000 (15:29 -0700)]
Don't fail if a key we want to delete is already deleted
This can happen when cleaning up stale users at boot time.
Bug:
30158800
Change-Id: I2733d8d525fc79b7f05eb2225b7e6e14c4da277f
Paul Crowley [Wed, 20 Jul 2016 04:13:49 +0000 (04:13 +0000)]
Don\'t evict keys when we delete users
am:
abc253884f
Change-Id: I2628957c50469948e78a5f1f626c3ace44eccbc0
Paul Crowley [Tue, 19 Jul 2016 23:00:35 +0000 (16:00 -0700)]
Don't evict keys when we delete users
Work around a kernel bug that was causing lockups.
Bug:
30225438
Change-Id: Ia6eb60774037e692351af8eaed98b79596ea3635
Jeff Sharkey [Mon, 18 Jul 2016 16:06:34 +0000 (16:06 +0000)]
Only restorecon CE storage after unlocked.
am:
d24aeda425
Change-Id: Ia4151dc87769bb4c4b7bee1bb0a09933c74f3d6c
Jeff Sharkey [Fri, 15 Jul 2016 22:20:22 +0000 (16:20 -0600)]
Only restorecon CE storage after unlocked.
On FBE devices, the filenames inside credential-encrypted directories
are mangled until the key is installed. This means the initial
restorecon at boot needs to skip these directories until the keys
are installed.
This CL uses an existing facility to request that init run a
recursive restorecon over a given path, and it requests that
operation for the CE directories that would have been omitted by
the SKIPCE flag earlier during boot.
Bug:
30126557
Change-Id: I8c7abea27215075a091f615a7185a82a2f4a4a95
Paul Crowley [Wed, 13 Jul 2016 19:54:02 +0000 (19:54 +0000)]
Merge \"Run secdiscard on encrypted key and key blob too\" into nyc-mr1-dev
am:
ec813c4e35
Change-Id: I8507fdc7e183a53d3bb129ed346cb649eddffff5
Paul Crowley [Wed, 13 Jul 2016 19:54:02 +0000 (19:54 +0000)]
Merge \"Zero out blocks if BLKSECDISCARD fails\" into nyc-mr1-dev
am:
d6a39dd78a
Change-Id: I7ee62f8cb0b2144f4385bd132a3d32ecf3d918d2
Paul Crowley [Wed, 13 Jul 2016 19:49:52 +0000 (19:49 +0000)]
Merge "Run secdiscard on encrypted key and key blob too" into nyc-mr1-dev
Paul Crowley [Wed, 13 Jul 2016 19:49:20 +0000 (19:49 +0000)]
Merge "Zero out blocks if BLKSECDISCARD fails" into nyc-mr1-dev
Paul Crowley [Thu, 7 Jul 2016 17:06:30 +0000 (10:06 -0700)]
Run secdiscard on encrypted key and key blob too
Don't rely on cryptographic binding of secdiscard to key; securely
delete the other information needed to reconstruct the key too.
Bug:
26021231
Change-Id: If03d2c051b0ec2fdcb5c6f70bde7e3287424f216
Paul Crowley [Tue, 28 Jun 2016 21:24:07 +0000 (14:24 -0700)]
Zero out blocks if BLKSECDISCARD fails
On a device where we can't BLKSECDISCARD sectors, we "overwrite" them
with zeroes. This changes the FTL to remap those sectors to new
locations. With this done, the old contents are accessible only given
a compromise of flash firmware or a die level attack.
Bug:
26021231
Change-Id: Ia065921389886fac1ba456c19c138187237c2561
Henrik Baard [Thu, 7 Jul 2016 01:35:42 +0000 (01:35 +0000)]
Failing to \"Migrate data\" leaves target unusable
am:
77f156d9f0
Change-Id: I56e313c68a35fbb67c0ad9d53f08fa24e4e8e742
Henrik Baard [Thu, 7 Jul 2016 01:35:41 +0000 (01:35 +0000)]
Migrating data sometimes leaves emulated unmounted
am:
7f52bca485
Change-Id: Id45c7edab0d244dcb17d6bda491ca297ed55c1c0
Jeff Sharkey [Wed, 6 Jul 2016 22:03:16 +0000 (22:03 +0000)]
Fix copy/paste error in benchmark code.
am:
f09a89a7d6
Change-Id: I297440d04990226091d724b2282e3fc8421bda58
Henrik Baard [Thu, 17 Dec 2015 12:58:42 +0000 (13:58 +0100)]
Failing to "Migrate data" leaves target unusable
When "migrating" data failes due to insufficient space
at target location, the data copied so far is left in
target location, which in practice is now filled to the
brim.
If copy fails clean up the data copied so far since user
has the data in original location.
Bug:
26322200
Change-Id: Iab29a7f9e653e6857ee0e2723d151dfec81b14dd
Henrik Baard [Thu, 26 Nov 2015 11:05:13 +0000 (12:05 +0100)]
Migrating data sometimes leaves emulated unmounted
Sometimes migrating data fails to mount the target
volume after operation is finished.
MoveTask is running in its own thread, copying data
between external card and internal memory.
After copying the data the method "bringOnline" is
run. This method destroys and creates the volumes.
When VolumeBase::create() is run it will notify
MountService, who upon receiving this notification
will send a mount command to mount the new primary
storage.
This command will sometimes run before
setState(State::kUnmounted); is called on the newly
created volume. This will cause the mount command to
fail.
VoldConnector: SND -> {10 volume mount emulated 3 -1}
vold : emulated flags change requires state unmounted or unmountable
vold : emulated user change requires state unmounted or unmountable
vold : emulated mount requires state unmounted or unmountable
Lock bringOnline so no volume commands will be processed
until volumes are (re-)created and have correct state.
Bug:
26322200
Change-Id: I4aba85c226d904c42ae9edcdfec21619218939d6
Jeff Sharkey [Mon, 27 Jun 2016 17:17:51 +0000 (11:17 -0600)]
Fix copy/paste error in benchmark code.
This had minimal impact on the results, since 95% of the writes were
performed through pwrite(), but it's important to fix this for future
benchmark suites.
Bug:
29759783
Change-Id: Ic628aab98b9f9def78508cc722899afdefed84ae
Yabin Cui [Thu, 30 Jun 2016 22:55:42 +0000 (22:55 +0000)]
Use libbootloader_message.
am:
1fb5966fbb
Change-Id: Ib97b3be116b704188082a81626a9b5ecdde56726
Yabin Cui [Fri, 24 Jun 2016 21:48:49 +0000 (14:48 -0700)]
Use libbootloader_message.
Bug:
29582118
Change-Id: I8de2cfbc62908011dba2ab86d17f977ebcfadac0
Paul Lawrence [Thu, 23 Jun 2016 20:31:55 +0000 (20:31 +0000)]
Stop dropping caches now we have kernel fix
am:
6abe6831b5
Change-Id: Ic87ca15267c205551e0bbfa087ea086d2ebce089
Chih-Hung Hsieh [Wed, 22 Jun 2016 21:36:05 +0000 (21:36 +0000)]
Merge \\\"Fix misc-macro-parentheses warnings in system/vold.\\\" am:
786c536e84 am:
c83c87e681
am:
f5e9bc9517
Change-Id: I1a505858b0a0407489e9adcdd894048e66cfc939
Chih-hung Hsieh [Wed, 22 Jun 2016 21:33:37 +0000 (21:33 +0000)]
Merge \\"Fix misc-macro-parentheses warnings in system/vold.\\" am:
786c536e84
am:
c83c87e681
Change-Id: I4b2bc593082ee4179adccd5868696a50d687cb0c
Chih-Hung Hsieh [Wed, 22 Jun 2016 21:31:07 +0000 (21:31 +0000)]
Merge \"Fix misc-macro-parentheses warnings in system/vold.\"
am:
786c536e84
Change-Id: Ida8cc5a6d17b526ff4f5af5f2406930333a385c8
Chih-hung Hsieh [Wed, 22 Jun 2016 21:21:16 +0000 (21:21 +0000)]
Merge "Fix misc-macro-parentheses warnings in system/vold."
Paul Lawrence [Wed, 22 Jun 2016 16:24:51 +0000 (09:24 -0700)]
Stop dropping caches now we have kernel fix
Only merge once
https://partner-android-review.googlesource.com/#/c/619829/1
has been merged into kernel.
Bug:
28779973
Change-Id: Icef78d1e4381e89e07797c36f6f650033d313557
Chih-Hung Hsieh [Fri, 10 Jun 2016 21:13:59 +0000 (14:13 -0700)]
Fix misc-macro-parentheses warnings in system/vold.
Add parentheses around macro arguments used beside operators.
Bug:
28705665
Change-Id: I44e954f15bf6b8279d0f857d5417b7cb457da779
Paul Lawrence [Fri, 27 May 2016 17:14:36 +0000 (17:14 +0000)]
Set encryption mode in mode file
am:
6e41059734
* commit '
6e410597343716924ed4943d1eabd3dea614d325':
Set encryption mode in mode file
Change-Id: Ic143f9cc8a301178416bd76d3ef6d2593df3dbd6
Paul Lawrence [Fri, 27 May 2016 17:13:33 +0000 (17:13 +0000)]
Revert "Add fileencrypted=software/ice to fstab options"
am:
3ae29e7740
* commit '
3ae29e774038b423618a1618c0056108db77759e':
Revert "Add fileencrypted=software/ice to fstab options"
Change-Id: I68ba6b70d619aa5ce1e529de759a26919ac75cf3
Paul Lawrence [Tue, 24 May 2016 21:20:38 +0000 (14:20 -0700)]
Set encryption mode in mode file
Bug:
28905864
Change-Id: Ie2a5c3e029075d53a86ef3afb7fe364c16d8d52b
Paul Lawrence [Mon, 23 May 2016 22:03:20 +0000 (22:03 +0000)]
Revert "Add fileencrypted=software/ice to fstab options"
This reverts commit
01f1bc725475098e5ae07fd8f440abcd55b154c4.
Bug:
28905864
Change-Id: I489f5d073530438829038630af7af6b2a5cbdbbe
Android Build Merger (Role) [Wed, 18 May 2016 23:02:45 +0000 (23:02 +0000)]
Merge "Two phases to set the password for disk encryption am:
a363036b44 am:
ad4dcc2ff6" into nyc-mr1-dev-plus-aosp
Paul Crowley [Wed, 18 May 2016 23:02:32 +0000 (23:02 +0000)]
Two phases to set the password for disk encryption am:
a363036b44
am:
8fd77a05cc
* commit '
8fd77a05ccccc86be7da7b2f61e6580f0f20eb42':
Two phases to set the password for disk encryption
Change-Id: I6c6aba077de8a9cb51df7ef55213ea750027278e
Paul Crowley [Wed, 18 May 2016 23:02:31 +0000 (23:02 +0000)]
Two phases to set the password for disk encryption am:
a363036b44
am:
ad4dcc2ff6
* commit '
ad4dcc2ff65363e3c93708f7f713bf73484c59c5':
Two phases to set the password for disk encryption
Change-Id: Ic4ba913e285ac3583f8c29227532c4c77094763e
Paul Crowley [Wed, 18 May 2016 22:59:57 +0000 (22:59 +0000)]
Two phases to set the password for disk encryption
am:
a363036b44
* commit '
a363036b44f7f140aa9a943578f56abff5880a60':
Two phases to set the password for disk encryption
Change-Id: I37368c698abcf4b541f924cb18927f4645edcb3f
Paul Crowley [Wed, 18 May 2016 22:59:57 +0000 (22:59 +0000)]
Two phases to set the password for disk encryption
am:
a363036b44
* commit '
a363036b44f7f140aa9a943578f56abff5880a60':
Two phases to set the password for disk encryption
Change-Id: Ia28823079d8c0bda220238339f28095b234a0ae5
Paul Crowley [Tue, 17 May 2016 21:17:56 +0000 (14:17 -0700)]
Two phases to set the password for disk encryption
Revert "Revert "Two phases to set the password for disk encryption""
This reverts commit
d402389290eeef86be7eb9241e20fdd125d44eb1.
In addition, fix the bug in the original commit.
Bug:
28154455
Bug:
28694324
Change-Id: I885f1d73e739416347c135d79979941c2bbdbe62
Chih-Hung Hsieh [Wed, 11 May 2016 23:07:08 +0000 (23:07 +0000)]
Merge "Fix misc-macro-parentheses warnings." am:
0c0f9228cf am:
4ff367a593
am:
5dc0aa6e41
* commit '
5dc0aa6e41fbd961ecefaa3fc6fe4ac720e53bc3':
Fix misc-macro-parentheses warnings.
Change-Id: I2acf395df99305784d1ada44897b1df26e0f5791
Chih-Hung Hsieh [Wed, 11 May 2016 23:03:58 +0000 (23:03 +0000)]
Merge "Fix misc-macro-parentheses warnings." am:
0c0f9228cf
am:
4ff367a593
* commit '
4ff367a5934a906ba2008e530efca220deb96af7':
Fix misc-macro-parentheses warnings.
Change-Id: I67d525e6f78b1d4e5854d40c30ad0bb96a3490dc
Chih-Hung Hsieh [Wed, 11 May 2016 23:00:48 +0000 (23:00 +0000)]
Merge "Fix misc-macro-parentheses warnings."
am:
0c0f9228cf
* commit '
0c0f9228cf1cd0f39ecb56f643ce7e3b050bb143':
Fix misc-macro-parentheses warnings.
Change-Id: I9fa6dc832ca4920c1f9f85a4fb85e61cd62fdeb5
Treehugger Robot [Wed, 11 May 2016 22:52:30 +0000 (22:52 +0000)]
Merge "Fix misc-macro-parentheses warnings."
Paul Lawrence [Wed, 11 May 2016 22:20:44 +0000 (22:20 +0000)]
Add fileencrypted=software/ice to fstab options
am:
01f1bc7254
* commit '
01f1bc725475098e5ae07fd8f440abcd55b154c4':
Add fileencrypted=software/ice to fstab options
Change-Id: I1c8b38e1b448cf7c41fd537880a0dd2d1f1d9218
Chih-Hung Hsieh [Wed, 11 May 2016 22:05:05 +0000 (15:05 -0700)]
Fix misc-macro-parentheses warnings.
Add parentheses around macro arguments used beside binary operators.
Bug:
28705665
Change-Id: I0731cb8b22b3a9bdadac6414473d90e8398a8e89
Paul Lawrence [Thu, 5 May 2016 18:02:07 +0000 (11:02 -0700)]
Add fileencrypted=software/ice to fstab options
Bug:
28616054
Change-Id: If3fddd62f069c7e3e8369a1db68e69c390059d63
Android Build Merger (Role) [Tue, 10 May 2016 22:20:17 +0000 (22:20 +0000)]
Merge "Merge "e4crypt_is_native has been moved into system/extras." into nyc-dev am:
cfa03d4a4c am:
44ddebaac0" into nyc-mr1-dev-plus-aosp
Paul Crowley [Tue, 10 May 2016 22:20:11 +0000 (22:20 +0000)]
Merge "e4crypt_is_native has been moved into system/extras." into nyc-dev am:
cfa03d4a4c
am:
269bdbcab1
* commit '
269bdbcab18aa8c24a637937d885c045f408a12e':
e4crypt_is_native has been moved into system/extras.
Change-Id: I7f08893a1e21891d35578180cbb66a4db2d91c15
Paul Crowley [Tue, 10 May 2016 22:20:05 +0000 (22:20 +0000)]
Merge "e4crypt_is_native has been moved into system/extras." into nyc-dev am:
cfa03d4a4c
am:
44ddebaac0
* commit '
44ddebaac0465a9a88b68ca04bbb69b576a0d067':
e4crypt_is_native has been moved into system/extras.
Change-Id: I02d14adeed72858771b5838e618b1fa8735ca7b1
Paul Crowley [Tue, 10 May 2016 22:17:38 +0000 (22:17 +0000)]
Merge "e4crypt_is_native has been moved into system/extras." into nyc-dev
am:
cfa03d4a4c
* commit '
cfa03d4a4c53acf41dca2c41a2efd00de06043bb':
e4crypt_is_native has been moved into system/extras.
Change-Id: I345475c44fb2d8812a25c9f2195c748cddc55bfe
Paul Crowley [Tue, 10 May 2016 22:17:33 +0000 (22:17 +0000)]
Merge "e4crypt_is_native has been moved into system/extras." into nyc-dev
am:
cfa03d4a4c
* commit '
cfa03d4a4c53acf41dca2c41a2efd00de06043bb':
e4crypt_is_native has been moved into system/extras.
Change-Id: Id199621d0e5544acadc4a4d4308a80c47b9ea3c8
Paul Crowley [Tue, 10 May 2016 22:12:49 +0000 (22:12 +0000)]
Merge "e4crypt_is_native has been moved into system/extras." into nyc-dev
Android Build Merger (Role) [Tue, 10 May 2016 21:22:36 +0000 (21:22 +0000)]
Merge "Revert "Two phases to set the password for disk encryption" am:
d402389290 am:
26642bf7bf" into nyc-mr1-dev-plus-aosp
Paul Crowley [Tue, 10 May 2016 21:22:31 +0000 (21:22 +0000)]
Revert "Two phases to set the password for disk encryption" am:
d402389290
am:
26642bf7bf
* commit '
26642bf7bf8f645f3d10fe0d36149d5f8b3b92fb':
Revert "Two phases to set the password for disk encryption"
Change-Id: If0ecc2132c5012ccc9c28912170b2e91a451ac99
Paul Crowley [Tue, 10 May 2016 21:22:27 +0000 (21:22 +0000)]
Revert "Two phases to set the password for disk encryption" am:
d402389290
am:
2f8b7d354c
* commit '
2f8b7d354c59b74cec719531728523bf19f88dce':
Revert "Two phases to set the password for disk encryption"
Change-Id: I89687b6a813caca0c214787d3e28d4e4106e7fe2
Paul Crowley [Tue, 10 May 2016 21:19:51 +0000 (21:19 +0000)]
Revert "Two phases to set the password for disk encryption"
am:
d402389290
* commit '
d402389290eeef86be7eb9241e20fdd125d44eb1':
Revert "Two phases to set the password for disk encryption"
Change-Id: I09735798116dd4e37dda60651dc085a09090a99d
Paul Crowley [Tue, 10 May 2016 21:19:47 +0000 (21:19 +0000)]
Revert "Two phases to set the password for disk encryption"
am:
d402389290
* commit '
d402389290eeef86be7eb9241e20fdd125d44eb1':
Revert "Two phases to set the password for disk encryption"
Change-Id: I53a3804fc7bff9c99840aeee36fc4b7ff8e46ac1
Paul Crowley [Tue, 10 May 2016 20:36:43 +0000 (20:36 +0000)]
Revert "Two phases to set the password for disk encryption"
This reverts commit
92c5eeb46779f0fa1c9e6db6b0d632d960cbb2e4.
Bug:
28694324
Change-Id: Ibbbaff287f4dd28f4a13e122a3617987a8875a44
Paul Crowley [Wed, 27 Apr 2016 17:25:12 +0000 (10:25 -0700)]
e4crypt_is_native has been moved into system/extras.
Bug:
28318405
Change-Id: Id962764cf7fb5f58b769bf99aeb6d3d69cb66991
Paul Crowley [Mon, 9 May 2016 22:00:50 +0000 (22:00 +0000)]
Two phases to set the password for disk encryption am:
92c5eeb467
am:
4e44272c3d
* commit '
4e44272c3d1e2f5c0040acefc3812781aeea1736':
Change-Id: I0eb0825eee3faffb27736cdaf92b98983369ef47
Paul Crowley [Mon, 9 May 2016 22:00:15 +0000 (22:00 +0000)]
Two phases to set the password for disk encryption am:
92c5eeb467
am:
bc7cfa8fcc
* commit '
bc7cfa8fcce8b09d308a7e511c5a2d4de530676a':
Two phases to set the password for disk encryption
Change-Id: Ifcde4025a0ce196c8208f802a6a5dfb4a24e2a0d
Paul Crowley [Mon, 9 May 2016 21:53:23 +0000 (21:53 +0000)]
Two phases to set the password for disk encryption
am:
92c5eeb467
* commit '
92c5eeb46779f0fa1c9e6db6b0d632d960cbb2e4':
Two phases to set the password for disk encryption
Change-Id: Ie10cfc91d59f38359560682ca5e4133dc8700c12
Paul Crowley [Mon, 9 May 2016 21:51:33 +0000 (21:51 +0000)]
Two phases to set the password for disk encryption
am:
92c5eeb467
* commit '
92c5eeb46779f0fa1c9e6db6b0d632d960cbb2e4':
Two phases to set the password for disk encryption
Change-Id: I82c1cfa2874ac4709e42f5c2047c832cbcaccb91
Paul Crowley [Fri, 22 Apr 2016 19:09:54 +0000 (12:09 -0700)]
Two phases to set the password for disk encryption
In one phase, we make the new password work, and in the second we make
it the only one which works ("fixation"). This means that we can set
the password in Gatekeeper between these two phases, and a crash
doesn't break things. Unlocking a user automatically fixates the
presented credential.
Bug:
28154455
Change-Id: I54623c8652f0c9f72dd60388a7dc0ab2d48e81c7
Paul Lawrence [Fri, 29 Apr 2016 16:38:12 +0000 (16:38 +0000)]
Merge "Drop caches after installing key policy to avoid cache clashes" into nyc-mr1-dev
am:
235e78b9ae
* commit '
235e78b9aede9d4a7f871f5064670afab5cb2d6b':
Drop caches after installing key policy to avoid cache clashes
Change-Id: I766e87aa700bd0a1312faac33092b3a0d20b5fd1
Paul Lawrence [Fri, 29 Apr 2016 16:32:02 +0000 (16:32 +0000)]
Merge "Drop caches after installing key policy to avoid cache clashes" into nyc-mr1-dev
Paul Lawrence [Tue, 26 Apr 2016 19:50:53 +0000 (12:50 -0700)]
Drop caches after installing key policy to avoid cache clashes
Note that this is an ugly workaround for a kernel bug.
Bug:
28373400
Change-Id: Iec1ae53f4e18f06e41e8cf1fcc3ab03fc9848632
Paul Crowley [Thu, 28 Apr 2016 00:20:07 +0000 (00:20 +0000)]
Use a longer timeout on the disk encryption keys am:
b3de337
am:
26335ed
* commit '
26335ed378cd31a9c31669db8756ec317efd2e97':
Change-Id: I784a3b84675fdff4b5d228c3bc5acf6b106f5ec7
Paul Crowley [Thu, 28 Apr 2016 00:01:44 +0000 (00:01 +0000)]
Use a longer timeout on the disk encryption keys am:
b3de337
am:
409c083
* commit '
409c083781f27b2924f051e8f7d130f62921ce1b':
Use a longer timeout on the disk encryption keys
Change-Id: I87cd4f37fdca430c3449471796ef24c3cbd7c225
Paul Crowley [Wed, 27 Apr 2016 23:45:26 +0000 (23:45 +0000)]
Use a longer timeout on the disk encryption keys
am:
b3de337
* commit '
b3de337acd7ad07de1ed30d24fdfd628d1d8590b':
Use a longer timeout on the disk encryption keys
Change-Id: Ie66bea62ccc5d8066a12b9a7acf26dafa4b2eaa3
Paul Crowley [Wed, 27 Apr 2016 22:53:18 +0000 (22:53 +0000)]
Use a longer timeout on the disk encryption keys
am:
b3de337
* commit '
b3de337acd7ad07de1ed30d24fdfd628d1d8590b':
Use a longer timeout on the disk encryption keys
Change-Id: Ieadec9da13383361ac76bf6b79ecea948965a1d9
Paul Crowley [Wed, 27 Apr 2016 19:58:41 +0000 (12:58 -0700)]
Use a longer timeout on the disk encryption keys
Avoid a timeout error by extending the time allowed between getting
the auth token and decrypting the key from five to thirty seconds.
Bug:
28398766
Change-Id: I1dbb9e0e33707e7de4c1720ad1b8e153c77094b2
Android Build Merger (Role) [Mon, 25 Apr 2016 23:59:47 +0000 (23:59 +0000)]
Merge "Merge "Unmount public sdcard filesystems before killing the fuse process." into nyc-dev am:
a4330be am:
c1428a5" into nyc-mr1-dev-plus-aosp
John Cormie [Mon, 25 Apr 2016 23:59:38 +0000 (23:59 +0000)]
Merge "Unmount public sdcard filesystems before killing the fuse process." into nyc-dev am:
a4330be
am:
a54cd87
* commit '
a54cd8739c8d313b66354f99ed9419ccc3f6be10':
Unmount public sdcard filesystems before killing the fuse process.
Change-Id: I11813de6b10a9a98af823443332bb07b82cc1d06
John Cormie [Mon, 25 Apr 2016 23:59:38 +0000 (23:59 +0000)]
Merge "Unmount public sdcard filesystems before killing the fuse process." into nyc-dev am:
a4330be
am:
c1428a5
* commit '
c1428a51c3d343814e683e2e9864a5cfee6836a0':
Unmount public sdcard filesystems before killing the fuse process.
Change-Id: I0b24d5c73deb67764092f7934c72ec48937e5286
John Cormie [Mon, 25 Apr 2016 23:57:06 +0000 (23:57 +0000)]
Merge "Unmount public sdcard filesystems before killing the fuse process." into nyc-dev
am:
a4330be
* commit '
a4330beb482c3b5decf6a6fc966e5589210130eb':
Unmount public sdcard filesystems before killing the fuse process.
Change-Id: I294d46bb27fb6d8ac83f1041e849fd366134b6ee
John Cormie [Mon, 25 Apr 2016 23:57:06 +0000 (23:57 +0000)]
Merge "Unmount public sdcard filesystems before killing the fuse process." into nyc-dev
am:
a4330be
* commit '
a4330beb482c3b5decf6a6fc966e5589210130eb':
Unmount public sdcard filesystems before killing the fuse process.
Change-Id: If9f7acd5bc77ee4ecf9eed7375881b5554e85b9a
John Cormie [Mon, 25 Apr 2016 23:49:28 +0000 (23:49 +0000)]
Merge "Unmount public sdcard filesystems before killing the fuse process." into nyc-dev
Martijn Coenen [Mon, 25 Apr 2016 18:19:28 +0000 (18:19 +0000)]
Merge "Move vold (and sdcard childs) to foreground cpuset." into nyc-dev am:
47ff14a
am:
05f1d81
* commit '
05f1d813cc2964339d3f606c52cd599cd378a530':
Change-Id: I289125919e8cffa06a400343d201583a6d550a5c
OSDN Git Service
