OSDN Git Service
Jeff Sharkey [Mon, 18 Jul 2016 16:09:35 +0000 (16:09 +0000)]
Only restorecon CE storage after unlocked. am:
d24aeda425
am:
e30c22a65b
Change-Id: Id36d43509d13c3ae2371cefa3aa17fda23f383df
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:57:44 +0000 (19:57 +0000)]
Merge \\"Run secdiscard on encrypted key and key blob too\\" into nyc-mr1-dev am:
ec813c4e35
am:
c79c92ad09
Change-Id: Iac921cc46b197cf7ec3b2b26ec6c393ce69226bd
Paul Crowley [Wed, 13 Jul 2016 19:57:43 +0000 (19:57 +0000)]
Merge \\"Zero out blocks if BLKSECDISCARD fails\\" into nyc-mr1-dev am:
d6a39dd78a
am:
a1b2949be2
Change-Id: Idf265f2e15fd5c650c73d8c9a1ca7ee26209f29a
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:53:29 +0000 (01:53 +0000)]
Failing to \\"Migrate data\\" leaves target unusable am:
77f156d9f0
am:
1bc5ab0c4d
Change-Id: I1b93a87bb03039c627a9e057a1d1b56a2304da9e
Henrik Baard [Thu, 7 Jul 2016 01:53:29 +0000 (01:53 +0000)]
Migrating data sometimes leaves emulated unmounted am:
7f52bca485
am:
78c63c26a7
Change-Id: I9262b09b9997e8b019b6a7de8d6bdb04279e580f
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:27:40 +0000 (22:27 +0000)]
Merge "resolve merge conflicts of
d254ce4 to master"
Jeff Sharkey [Wed, 6 Jul 2016 22:26:43 +0000 (16:26 -0600)]
resolve merge conflicts of
d254ce4 to master
Change-Id: Ia8dff82cb7648b568006d10bc99e2dd40a2d6e8e
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 23:11:19 +0000 (23:11 +0000)]
Use libbootloader_message. am:
1fb5966fbb
am:
951de915a3
Change-Id: I6a3291a9930b8e173f9ea7bae6c3f1275b3589ad
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:47:16 +0000 (20:47 +0000)]
Stop dropping caches now we have kernel fix am:
6abe6831b5
am:
1882daee64
Change-Id: I9d10491d3b54e574cf4ece65be4dc8e3cc5f6be3
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:46:51 +0000 (21:46 +0000)]
Merge \\\\"Fix misc-macro-parentheses warnings in system/vold.\\\\" am:
786c536e84 am:
c83c87e681 am:
f5e9bc9517
am:
efe8b3de96
Change-Id: I157cdbcf2e66ab5e992f653b4a1f9f5fc6520ffd
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
Seigo Nonaka [Mon, 20 Jun 2016 08:05:40 +0000 (17:05 +0900)]
Prepare necessary data directory before loading persistent properties.
init reads files in /data/property/ but it is not ready to read when
trigger_load_persist_props is triggered by vold.decrypt.
Bug:
29332975
Change-Id: I14beac8714ff2f722d8b11f666bc7ca693ccd46e
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 20:55:00 +0000 (20:55 +0000)]
Set encryption mode in mode file am:
6e41059734
am:
3560d44f70
* commit '
3560d44f709fc11eda978c4c513c24ed805193cc':
Set encryption mode in mode file
Change-Id: Iadecc7032a2028f496bb128b0a7f33719187733b
Paul Lawrence [Fri, 27 May 2016 20:51:41 +0000 (20:51 +0000)]
Revert "Add fileencrypted=software/ice to fstab options" am:
3ae29e7740
am:
bef3ec859d
* commit '
bef3ec859d71d3eb4992061f7ccf1b4049313fd7':
Revert "Add fileencrypted=software/ice to fstab options"
Change-Id: I9e80a8ec6cd4f7b11f7a46736fb65df1b6d845aa
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
Paul Crowley [Wed, 18 May 2016 23:09:15 +0000 (23:09 +0000)]
Merge "Two phases to set the password for disk encryption am:
a363036b44 am:
ad4dcc2ff6" into nyc-mr1-dev-plus-aosp
am:
9ecf3d5904
* commit '
9ecf3d5904fc7426c71565361e3a1652719a6620':
Change-Id: Ic349ec00115052fa01f00662e77257a545bcf97a
Paul Crowley [Wed, 18 May 2016 23:09:14 +0000 (23:09 +0000)]
Two phases to set the password for disk encryption am:
a363036b44 am:
8fd77a05cc
am:
59fc77e3e3
* commit '
59fc77e3e37f8ef052cb0fa74b9b6456750a6c2c':
Two phases to set the password for disk encryption
Change-Id: I09337fd3a410f190d7a2c0e1cf6505658d2748ed
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 [Thu, 12 May 2016 00:55:30 +0000 (00:55 +0000)]
Merge "Fix misc-macro-parentheses warnings." am:
0c0f9228cf am:
4ff367a593 am:
5dc0aa6e41
am:
6e8ebe8f76
* commit '
6e8ebe8f763bfcea9b7420e9efa62e61e2260f58':
Fix misc-macro-parentheses warnings.
Change-Id: I518c580eda89fbc9f987e8ac36001b57c29f7f01
Paul Lawrence [Thu, 12 May 2016 00:55:24 +0000 (00:55 +0000)]
Add fileencrypted=software/ice to fstab options am:
01f1bc7254
am:
6d22919805
* commit '
6d229198053f392a9c61abb10cdcee7463fb4436':
Add fileencrypted=software/ice to fstab options
Change-Id: I1784e8c98fead7f0444c0014686cb6fd60e48466
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
Paul Crowley [Tue, 10 May 2016 22:22:46 +0000 (22:22 +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
am:
fc592066a7
* commit '
fc592066a7f9a15b39a2184bd8f919ff14bfca2b':
Change-Id: Icbdbc5adda30a28f65f7f1a7a6719bdb5ff99dd5
Paul Crowley [Tue, 10 May 2016 22:22:46 +0000 (22:22 +0000)]
Merge "e4crypt_is_native has been moved into system/extras." into nyc-dev am:
cfa03d4a4c am:
269bdbcab1
am:
b0f2d02d49
* commit '
b0f2d02d49dcb526426b2b590a53b80ff47c785d':
e4crypt_is_native has been moved into system/extras.
Change-Id: Ib6e4a66c0081439670b6b03fd8939d911faf14d3
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
Paul Crowley [Tue, 10 May 2016 21:25:31 +0000 (21:25 +0000)]
Merge "Revert "Two phases to set the password for disk encryption" am:
d402389290 am:
26642bf7bf" into nyc-mr1-dev-plus-aosp
am:
8d5165ab0f
* commit '
8d5165ab0fbf0dcf3e639bb1dbdc11ed6c152f8b':
Change-Id: I412b2816fb1fcf4fbefc9a72c8d6852a79d1eace
Paul Crowley [Tue, 10 May 2016 21:25:30 +0000 (21:25 +0000)]
Revert "Two phases to set the password for disk encryption" am:
d402389290 am:
2f8b7d354c
am:
6a87b09b32
* commit '
6a87b09b32adc739b524002354b21bf235ff2153':
Revert "Two phases to set the password for disk encryption"
Change-Id: Ic7eec73c5fba36a17e3303f2cf06aee1a7435913
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:11:06 +0000 (22:11 +0000)]
Two phases to set the password for disk encryption am:
92c5eeb467 am:
4e44272c3d
am:
a6bc1fea18
* commit '
a6bc1fea1853f917d57f78233fe312ec19343a2f':
Change-Id: Ie434a2b1ebf510ebc7e76f234eb305dbda65f282
Paul Crowley [Mon, 9 May 2016 22:11:06 +0000 (22:11 +0000)]
Two phases to set the password for disk encryption am:
92c5eeb467 am:
bc7cfa8fcc
am:
c7e803bcc9
* commit '
c7e803bcc913e70f4cf8047e16f4f758d080c3fe':
Two phases to set the password for disk encryption
Change-Id: I09dedebcb3dd91b0a045f1c920d43c9fc7a756cb
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
Chih-hung Hsieh [Sat, 30 Apr 2016 00:41:49 +0000 (00:41 +0000)]
Merge "Fix google-explicit-constructor warnings."
Chih-Hung Hsieh [Fri, 29 Apr 2016 21:42:01 +0000 (14:42 -0700)]
Fix google-explicit-constructor warnings.
Bug:
28341362
Change-Id: I30adc5ba8e977aa6626d12f0981fa580d1425a4e
Paul Lawrence [Fri, 29 Apr 2016 16:40:55 +0000 (16:40 +0000)]
Merge "Drop caches after installing key policy to avoid cache clashes" into nyc-mr1-dev am:
235e78b9ae
am:
7b6ff76185
* commit '
7b6ff7618562802fc8b1fd8abf5c3e6589216ceb':
Drop caches after installing key policy to avoid cache clashes
Change-Id: Iacc5e9d73595b3bfd328e16f2b970b4e7f7b98bc
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 01:49:40 +0000 (01:49 +0000)]
Use a longer timeout on the disk encryption keys am:
b3de337 am:
26335ed
am:
1cc3cc5
* commit '
1cc3cc59f6d79b59064e1021975201f086fb356d':
Change-Id: Ide61c33fd6b4338e0d56fc03ca50c96e4bae4f59
Paul Crowley [Thu, 28 Apr 2016 01:49:39 +0000 (01:49 +0000)]
Use a longer timeout on the disk encryption keys am:
b3de337 am:
409c083
am:
50da911
* commit '
50da911fda64205677571d9cb1d668336cfb0f7f':
Use a longer timeout on the disk encryption keys
Change-Id: I43279eb3a1bd92839c2d742acc95cb96c920b5dd
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
John Cormie [Tue, 26 Apr 2016 16:39:00 +0000 (16:39 +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
am:
04c341b
* commit '
04c341b0ebd3e5519efd68f5bb38728ec0fe1520':
Change-Id: Ib7e296f8eb567d676ffaa482e2b3745477322fa7
John Cormie [Tue, 26 Apr 2016 16:39:00 +0000 (16:39 +0000)]
Merge "Unmount public sdcard filesystems before killing the fuse process." into nyc-dev am:
a4330be am:
a54cd87
am:
206cac8
* commit '
206cac88f3fed4030ea42598bf1e10e7ac8c2899':
Unmount public sdcard filesystems before killing the fuse process.
Change-Id: Iae6070abc68ce59f5cbb839cc55ce8fde8d70e3f
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
OSDN Git Service
