OSDN Git Service
Andreas Gampe [Sat, 24 Sep 2016 17:24:16 +0000 (17:24 +0000)]
Merge "Vold: remove unused define" am:
7ac97f8e37 am:
de114c0d89 am:
dd0fc053d2
am:
32e3190d10
Change-Id: Ib391bcc98f072200418c9827b848ed718f7a9148
Andreas Gampe [Sat, 24 Sep 2016 16:49:04 +0000 (16:49 +0000)]
Merge "Vold: remove unused define" am:
7ac97f8e37 am:
de114c0d89
am:
dd0fc053d2
Change-Id: I2d223f85f22929ed531d6fabb86cfbe2727aa71b
Andreas Gampe [Sat, 24 Sep 2016 16:46:42 +0000 (16:46 +0000)]
Merge "Vold: remove unused define" am:
7ac97f8e37
am:
de114c0d89
Change-Id: Ida80b4ef12a7fcccadd219c7a7a4151a6f1b6098
Andreas Gampe [Sat, 24 Sep 2016 16:44:43 +0000 (16:44 +0000)]
Merge "Vold: remove unused define"
am:
7ac97f8e37
Change-Id: I617533e47e28a8081f7a2f477bda0c44fb3ea992
Treehugger Robot [Sat, 24 Sep 2016 16:39:04 +0000 (16:39 +0000)]
Merge "Vold: remove unused define"
Andreas Gampe [Sat, 24 Sep 2016 00:56:17 +0000 (17:56 -0700)]
Vold: remove unused define
Introduced in commit
36801cccf27152c9eca5aab6ba3527221525110f,
but never used.
Test: m
Bug:
31338270
Change-Id: I90bbab0208032b75b3700b02f0dc053b0e5ed38a
Dan Albert [Thu, 22 Sep 2016 09:26:57 +0000 (09:26 +0000)]
Merge "Add missing include." am:
45b09e9144 am:
2ab88f0a77 am:
9d7bf437b0
am:
5ee8b78072
Change-Id: I462ba50baf0741f67d28bb935542b708e35fa56a
Dan Albert [Thu, 22 Sep 2016 09:16:19 +0000 (09:16 +0000)]
Merge "Add missing include." am:
45b09e9144 am:
2ab88f0a77
am:
9d7bf437b0
Change-Id: Id77fcbc8bffc2e45a0b1d3f5e4ac5fdc195711be
Dan Albert [Wed, 21 Sep 2016 23:42:36 +0000 (23:42 +0000)]
Merge "Add missing include." am:
45b09e9144
am:
2ab88f0a77
Change-Id: I84171fb41e8cd0040da34891d9b527400ff49b3f
Dan Albert [Wed, 21 Sep 2016 23:22:29 +0000 (23:22 +0000)]
Merge "Add missing include."
am:
45b09e9144
Change-Id: I97b57690ed9cccd71b0c3d9b83fb1fd0f2e3d835
Treehugger Robot [Wed, 21 Sep 2016 22:40:08 +0000 (22:40 +0000)]
Merge "Add missing include."
Dan Albert [Wed, 21 Sep 2016 20:57:53 +0000 (13:57 -0700)]
Add missing include.
Test: mm
Bug: None
Change-Id: If3cbe642292016fdac603cce83f3ef252dda7481
Wei Wang [Wed, 7 Sep 2016 18:08:31 +0000 (18:08 +0000)]
Update fs_mgr_mount_all function am:
84c985e275 am:
c3c04acae6
am:
b2c339739b
Change-Id: I505cae6837e0f175123823738e953fc05a504962
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:24:37 +0000 (20:24 +0000)]
Merge "Update fs_mgr_mount_all function" am:
1d58bcf6d4 am:
554d8679e7 am:
02a52f1f10
am:
bb4611b43b
Change-Id: I28d7a286ed8d4465383268263c44680538336c34
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
Wei Wang [Tue, 6 Sep 2016 18:23:54 +0000 (18:23 +0000)]
Merge "Update fs_mgr_mount_all function"
Jeff Sharkey [Thu, 1 Sep 2016 01:08:16 +0000 (01:08 +0000)]
DO NOT MERGE. Block adoptable storage when using FBE. am:
84be704af4 am:
1fbe38f424
am:
697cd037ad -s ours
Change-Id: Ie92c12f205634ff4658ebfc7511eefd65495ad5b
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)
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
Bug:
30118894
Change-Id: I5e925b900fd477f230a90514cc2b561c7a7e9f49
TreeHugger Robot [Tue, 23 Aug 2016 22:45:59 +0000 (22:45 +0000)]
Merge "Blocking mode for debugging purposes."
Jeff Sharkey [Tue, 23 Aug 2016 19:48:50 +0000 (13:48 -0600)]
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
Paul Crowley [Mon, 16 May 2016 15:14:56 +0000 (08:14 -0700)]
Support Keymaster 2 configuration and key upgrading
Bug:
27212248
Change-Id: I96bd9a442f4f535ba6ea44c9e81bcc1fee0ec471
Jeff Sharkey [Fri, 29 Jul 2016 21:52:41 +0000 (15:52 -0600)]
Blocking mode for debugging purposes.
The default non-blocking mode doesn't log stdout/err from the
commands exec'ed during a move.
Bug:
29923055
Change-Id: I9de3fe9bfcfa3c1d39a32ecc89dd765202460376
Chih-Hung Hsieh [Tue, 2 Aug 2016 20:46:54 +0000 (20:46 +0000)]
Merge "Fix google-explicit-constructor warnings in system/vold." am:
a3bcf26d93 am:
9bf2a320e7 am:
1c1c4edb98
am:
3634db02a4
Change-Id: I4ce806283833c3fe8bcb713726e7fc3c0d087c90
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:50:26 +0000 (00:50 +0000)]
Merge \\\\"Fix clang-tidy performance warnings in system/vold.\\\\" am:
e24d4eef9b am:
aa668f3d13 am:
ed1c4cf456
am:
73a3576ef9
Change-Id: I7aa15c236ba857833b392e2eb5646f468761749a
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:35:39 +0000 (16:35 +0000)]
Don\\'t try to fixate CE keys for ephemeral users am:
25a713873c
am:
048d4c8518
Change-Id: I0d612f2fda4595181331d0463a3080383cfb5950
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:53:07 +0000 (16:53 +0000)]
Don\\'t fail if a key we want to delete is already deleted am:
ab0b56aef3
am:
2fa4435fae
Change-Id: Ia94ef7372900449af7fabd2bffeb592f831b073d
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:16:21 +0000 (04:16 +0000)]
Don\\'t evict keys when we delete users am:
abc253884f
am:
00256b54f2
Change-Id: Ia1d169adbfc93b7b588384b7655c82ed6338214d
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
Thurston Dang [Wed, 20 Jul 2016 00:32:00 +0000 (00:32 +0000)]
Merge "Call EVP_CIPHER_CTX_cleanup to avoid leaking memory that was allocated in EVP_DecryptInit_ex"
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
Thurston Hou Yeen Dang [Mon, 18 Jul 2016 21:16:37 +0000 (14:16 -0700)]
Call EVP_CIPHER_CTX_cleanup to avoid leaking memory that was allocated in EVP_DecryptInit_ex
Also add matching cleanup to EVP_EncryptInit_ex for symmetry (though I'm not
convinced it actually leaks memory)
Change-Id: Icf72dd9e0295d8b6ea55909266a43e684b16420f
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