OSDN Git Service
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, 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
Martijn Coenen [Mon, 25 Apr 2016 18:09:13 +0000 (18:09 +0000)]
Merge "Move vold (and sdcard childs) to foreground cpuset." into nyc-dev am:
47ff14a
am:
f56b110
* commit '
f56b1109197658e2da9c86d1ead93e52b3e01532':
Move vold (and sdcard childs) to foreground cpuset.
Change-Id: I69b5a07a0e5e5cc997ce5cfa36c154024537f490
Martijn Coenen [Mon, 25 Apr 2016 18:03:49 +0000 (18:03 +0000)]
Merge "Move vold (and sdcard childs) to foreground cpuset." into nyc-dev
am:
47ff14a
* commit '
47ff14ad38ec96fef25b2bbe1b3365fcd97bc8f5':
Move vold (and sdcard childs) to foreground cpuset.
Change-Id: Iad30255947ff204325736b361e883aaeaa31a473
Martijn Coenen [Mon, 25 Apr 2016 18:03:42 +0000 (18:03 +0000)]
Merge "Move vold (and sdcard childs) to foreground cpuset." into nyc-dev
am:
47ff14a
* commit '
47ff14ad38ec96fef25b2bbe1b3365fcd97bc8f5':
Move vold (and sdcard childs) to foreground cpuset.
Change-Id: I2d539472902f0f2ce33bbfe767f93b9bf91856ce
Martijn Coenen [Mon, 25 Apr 2016 17:46:01 +0000 (17:46 +0000)]
Merge "Move vold (and sdcard childs) to foreground cpuset." into nyc-dev
John Cormie [Mon, 18 Apr 2016 21:23:29 +0000 (14:23 -0700)]
Unmount public sdcard filesystems before killing the fuse process.
Avoids ENOTCONN during eject for sdcard users.
Change-Id: I7b89ccaad4bb7af3639dc0b702168030a2f88366
Bug:
28268676
Paul Lawrence [Tue, 19 Apr 2016 14:52:42 +0000 (14:52 +0000)]
Merge "Don\'t start defaultcrypto twice" into nyc-dev am:
0264d8f
am:
c771d20
* commit '
c771d2086043d7b7d665a18b003937b1e142b7f0':
Change-Id: Iabd62fdefbf3ea43833bc2fdb9364d51a5bba779
Paul Lawrence [Tue, 19 Apr 2016 14:50:07 +0000 (14:50 +0000)]
Merge "Don\'t start defaultcrypto twice" into nyc-dev am:
0264d8f
am:
e72c338
* commit '
e72c33872e2105ca1e63ba4f891ac68a6330dffa':
Don't start defaultcrypto twice
Change-Id: Ibad904c5df684b03b80771a6a90c6a1ee49e073f
Paul Lawrence [Tue, 19 Apr 2016 14:47:13 +0000 (14:47 +0000)]
Merge "Don\'t start defaultcrypto twice" into nyc-dev
am:
0264d8f
* commit '
0264d8ff7c2d5a2cdb4faaf9a3493103138373dd':
Don't start defaultcrypto twice
Change-Id: I39951628d41f656901658cd82a56298ef9f663ec
Paul Lawrence [Tue, 19 Apr 2016 14:47:08 +0000 (14:47 +0000)]
Merge "Don\'t start defaultcrypto twice" into nyc-dev
am:
0264d8f
* commit '
0264d8ff7c2d5a2cdb4faaf9a3493103138373dd':
Don't start defaultcrypto twice
Change-Id: Ief95c3bf7798cf6090f68fb2eac124677d448187
Paul Lawrence [Tue, 19 Apr 2016 14:44:26 +0000 (14:44 +0000)]
Merge "Don't start defaultcrypto twice" into nyc-dev
Paul Lawrence [Fri, 15 Apr 2016 22:41:33 +0000 (15:41 -0700)]
Don't start defaultcrypto twice
The old way (using triggers) starts defaultcrypto twice because
queue_property_triggers_action retriggers the action.
Bug:
27452459
Change-Id: I715d5441f8ae0b820b680f6a75f51694c4420992
Jeff Sharkey [Mon, 18 Apr 2016 20:15:17 +0000 (20:15 +0000)]
Consistent creation/destruction of user data. am:
be70c9a
am:
c85be2f
* commit '
c85be2fc40ec7d7a70fee4b19325de21ff085724':
Change-Id: I93288ad9c962639dbfa63e33395f0ac3952b045b
Jeff Sharkey [Mon, 18 Apr 2016 20:05:56 +0000 (20:05 +0000)]
Consistent creation/destruction of user data. am:
be70c9a
am:
30b0a1f
* commit '
30b0a1fcdd2c7a60c104ffcd3dca4c9c2c1e682b':
Consistent creation/destruction of user data.
Change-Id: I72e91bbf15eaf91c72a61a26baf2e6908934958a
Jeff Sharkey [Mon, 18 Apr 2016 19:59:55 +0000 (19:59 +0000)]
Consistent creation/destruction of user data.
am:
be70c9a
* commit '
be70c9ae2251ac8f3bfbbe75146f8c533d64e01b':
Consistent creation/destruction of user data.
Change-Id: I55f4fe88a8c02d019fa92028e6ad358fc0f75aeb
Jeff Sharkey [Mon, 18 Apr 2016 19:59:50 +0000 (19:59 +0000)]
Consistent creation/destruction of user data.
am:
be70c9a
* commit '
be70c9ae2251ac8f3bfbbe75146f8c533d64e01b':
Consistent creation/destruction of user data.
Change-Id: Iddb906f6df0587faf95198446c376b2e8d550bec
Jeff Sharkey [Fri, 15 Apr 2016 02:45:16 +0000 (20:45 -0600)]
Consistent creation/destruction of user data.
Preparing and destroying users currently needs to be split across
installd, system_server, and vold, since no single party has all the
required SELinux permissions.
Bug:
27896918,
25861755
Change-Id: Ieec14ccacfc7a3a5ab00df47ace7318feb900c38
Martijn Coenen [Fri, 15 Apr 2016 12:30:40 +0000 (14:30 +0200)]
Move vold (and sdcard childs) to foreground cpuset.
Bug:
24949295
Change-Id: I7118a374db90ede517a92f72763d624b9a234ea7
Elliott Hughes [Tue, 12 Apr 2016 23:44:04 +0000 (16:44 -0700)]
resolve merge conflicts of
81fd991 to nyc-dev-plus-aosp
Change-Id: Iabda2c9ad05ed4aa0a078c5da40b887f36dd9328
Mattias Nissler [Tue, 12 Apr 2016 23:27:37 +0000 (23:27 +0000)]
Merge "Switch to BoringSSL crypto."
am:
af458c4
* commit '
af458c478a9f333fa39bdddb9a7aa097a2196b64':
Switch to BoringSSL crypto.
Change-Id: Ie3c9a05bfd05dfa9b1a79fe42b59d0dfb3346843
Elliott Hughes [Tue, 12 Apr 2016 23:12:35 +0000 (23:12 +0000)]
Merge "Switch to BoringSSL crypto."
Dan Austin [Tue, 12 Apr 2016 22:35:50 +0000 (22:35 +0000)]
Merge "Address const issues in preparation for libcxx rebase." am:
a4f7dad
am:
3cc69fa
* commit '
3cc69faa6797ae0cfe43f4243d564fbe14f4cfe4':
Address const issues in preparation for libcxx rebase.
Change-Id: I58f814d71e5d5c067ade613d0bf8a88911d53424
Dan Austin [Tue, 12 Apr 2016 22:33:13 +0000 (22:33 +0000)]
Merge "Address const issues in preparation for libcxx rebase."
am:
a4f7dad
* commit '
a4f7dadd389e25d2b5749d1edf65081b3a4e6961':
Address const issues in preparation for libcxx rebase.
Change-Id: I63c3a205db98d956c3c02a4f4f6fd87fd4e052e8
Dan Austin [Tue, 12 Apr 2016 22:21:17 +0000 (22:21 +0000)]
Merge "Address const issues in preparation for libcxx rebase."
Yabin Cui [Sat, 9 Apr 2016 01:09:55 +0000 (01:09 +0000)]
Merge "vold: write bootloader message directly." into nyc-dev
am:
cbedcc3
* commit '
cbedcc30b32d79d77d89f23074da4dc76bf5e26d':
vold: write bootloader message directly.
Change-Id: Ib8f63a49a86c0e9e7a231cb5d22f6bb9a14e820f
Yabin Cui [Fri, 8 Apr 2016 21:03:42 +0000 (21:03 +0000)]
Merge "vold: write bootloader message directly." into nyc-dev
Daichi Hirono [Thu, 7 Apr 2016 08:16:07 +0000 (08:16 +0000)]
Add log flag for verbose AppFuse log for nyc-dev.
am:
2d6555f
* commit '
2d6555f33a5b0fd1e9f0db87e3a2146c3c26add0':
Add log flag for verbose AppFuse log for nyc-dev.
Change-Id: I8a2325c0dfd70888e635994f8aa5901fbf57efac
Daichi Hirono [Thu, 7 Apr 2016 05:59:32 +0000 (14:59 +0900)]
Add log flag for verbose AppFuse log for nyc-dev.
Change-Id: I60ca596e32f8668ae5895e671d92c4978ede6314
Fixed:
28055420
Yabin Cui [Thu, 7 Apr 2016 00:21:38 +0000 (17:21 -0700)]
vold: write bootloader message directly.
Bug:
27176738
Change-Id: I09bfe777e383325809d7ecc2dcb9129fe234053f
Mattias Nissler [Thu, 31 Mar 2016 14:32:59 +0000 (16:32 +0200)]
Switch to BoringSSL crypto.
This replaces the libmincrypt dependency with libcrypto_utils, which
is needed due to libfec and fs_mgr switching to BoringSSL.
Change-Id: I4f6f4d8cc5e200679331a9bcdf2cc3bad1082dd6
Jeff Sharkey [Thu, 31 Mar 2016 03:47:49 +0000 (03:47 +0000)]
Kill apps using PublicVolume when unmounting.
am:
8aff854
* commit '
8aff854b940039cce5fa2a227b19e39de6787b20':
Kill apps using PublicVolume when unmounting.
Change-Id: I12332ee8d416eb2bba0f940a5f8bf64c5766c774
Jeff Sharkey [Thu, 31 Mar 2016 02:37:28 +0000 (20:37 -0600)]
Kill apps using PublicVolume when unmounting.
Bug:
24863778
Change-Id: I86a482c6de78afe2e09ca91165000e1b10a42058
Paul Crowley [Tue, 29 Mar 2016 20:30:13 +0000 (20:30 +0000)]
Don\'t fail if the CE key isn\'t loaded in destroy_user_key
am:
71ee662
* commit '
71ee662ec3f82db66f1a34579aff75cc27d4b205':
Don't fail if the CE key isn't loaded in destroy_user_key
Change-Id: I7700f07dfa3421e57149aacf1a98b0a5eb8bf917
Paul Crowley [Fri, 25 Mar 2016 22:50:01 +0000 (15:50 -0700)]
Don't fail if the CE key isn't loaded in destroy_user_key
Users don't have to be unlocked to be deleted, so don't worry if we
don't have their key to evict.
Bug:
26847403
Bug:
27441228
Change-Id: Ifd93f620926630aa102a3bb4a5d2d45d34f9b75d
Dan Austin [Thu, 24 Mar 2016 19:26:39 +0000 (12:26 -0700)]
Address const issues in preparation for libcxx rebase.
Change-Id: I5199c1eb4e874fd354beefa1232707949483e88d
Paul Crowley [Thu, 17 Mar 2016 19:57:36 +0000 (19:57 +0000)]
Support Keymaster2 with lots of clever template logic :)
am:
0323afd
* commit '
0323afd69d82ce900d520f4611f56e6c06fc08a1':
Support Keymaster2 with lots of clever template logic :)
Paul Crowley [Wed, 16 Mar 2016 00:04:39 +0000 (17:04 -0700)]
Support Keymaster2 with lots of clever template logic :)
Bug:
27718275
Change-Id: I0b2aa74f45fd07a121ce0c342b27426a3fe593ce
Paul Lawrence [Fri, 11 Mar 2016 23:45:29 +0000 (23:45 +0000)]
Fix some static analyser issues
am:
300dae7c38
* commit '
300dae7c38e6853148a998dfc1030b2be40490b5':
Fix some static analyser issues