OSDN Git Service
Tom Cherry [Fri, 31 Mar 2017 16:45:11 +0000 (16:45 +0000)]
Merge "vdc: use libbase logging and log directly to kmsg on boot" am:
4f6c1ee19f
am:
e3a8a60024
Change-Id: Ifae6798ca5d352c05cd78dce59087bf3a29eede8
Tom Cherry [Fri, 31 Mar 2017 16:43:12 +0000 (16:43 +0000)]
Merge "vdc: use libbase logging and log directly to kmsg on boot"
am:
4f6c1ee19f
Change-Id: Ib5c11abb027f5c91f448e0322a11ed93c4ce29e2
Tom Cherry [Fri, 31 Mar 2017 16:41:00 +0000 (16:41 +0000)]
Merge "vdc: use libbase logging and log directly to kmsg on boot"
Tom Cherry [Wed, 29 Mar 2017 23:50:28 +0000 (16:50 -0700)]
vdc: use libbase logging and log directly to kmsg on boot
Init is no longer calling vdc with logwrapper, so it must take care of
logging to kmsg directly.
Test: observe logging in kmsg on boot and stderr on normal usage
Change-Id: Ie3e59da433bd154f121ce103dea0c59eb0bab069
Keun-young Park [Wed, 15 Mar 2017 02:52:10 +0000 (02:52 +0000)]
Merge "make shutdown safe for double calls." am:
71fa1068de
am:
2f93c657f4
Change-Id: I78962b7272ef0c39a133db042f36684fc1324018
Keun-young Park [Wed, 15 Mar 2017 02:47:09 +0000 (02:47 +0000)]
Merge "make shutdown safe for double calls."
am:
71fa1068de
Change-Id: I161c96dc5a44890fffe8fcdf9e0f8fc874df29c0
Treehugger Robot [Wed, 15 Mar 2017 02:39:50 +0000 (02:39 +0000)]
Merge "make shutdown safe for double calls."
Keun-young Park [Tue, 14 Mar 2017 01:02:50 +0000 (18:02 -0700)]
make shutdown safe for double calls.
- In new shutdown sequence, volume shutdown is requested in two places:
system_server and init.
- Make VolumeManager.shutdown safe for double calls.
It crashed before this change.
bug:
36004738
Test: reboot and check last_kmsg for crash / vdc timeout
Change-Id: I296913959b2647b65d66553073f2032545beba57
Bowgo Tsai [Fri, 10 Mar 2017 02:15:05 +0000 (02:15 +0000)]
Merge "vold: replacing fs_mgr_read_fstab() with fs_mgr_read_fstab_default()" am:
92f21f5294
am:
f53cc1b04a
Change-Id: I05095049ec6f478c3b9b31bccd6c828cf52b7d7c
Bowgo Tsai [Fri, 10 Mar 2017 02:12:40 +0000 (02:12 +0000)]
Merge "vold: replacing fs_mgr_read_fstab() with fs_mgr_read_fstab_default()"
am:
92f21f5294
Change-Id: I830cc6be023737b9befc112fdf9b010996314ec9
Treehugger Robot [Fri, 10 Mar 2017 02:07:34 +0000 (02:07 +0000)]
Merge "vold: replacing fs_mgr_read_fstab() with fs_mgr_read_fstab_default()"
Bowgo Tsai [Thu, 9 Mar 2017 15:11:33 +0000 (23:11 +0800)]
vold: replacing fs_mgr_read_fstab() with fs_mgr_read_fstab_default()
The original default /fstab.{ro.hardware} might be moved to /vendor/etc/.
or /odm/etc/. Use the new API to get the default fstab instead of using
the hard-coded /fstab.{ro.hardware}.
Bug:
35811655
Test: boot marlin with /vendor/etc/fstab.marlin
Change-Id: I92d6aefe6ff3433b7d1a671358d990bb7b1f2150
Wei Wang [Tue, 7 Mar 2017 20:29:11 +0000 (20:29 +0000)]
Merge "vold: add coldboot back and make sure it won't block booting" am:
b3715cf3af
am:
5457b47f9e
Change-Id: If63bbecc52fec415b38b86ddc32706a3742fcad3
Wei Wang [Tue, 7 Mar 2017 20:25:40 +0000 (20:25 +0000)]
Merge "vold: add coldboot back and make sure it won't block booting"
am:
b3715cf3af
Change-Id: I725dc07d0bd3afa73081affb56a24e6a216ec9d2
Treehugger Robot [Tue, 7 Mar 2017 20:24:00 +0000 (20:24 +0000)]
Merge "vold: add coldboot back and make sure it won't block booting"
Calin Juravle [Tue, 7 Mar 2017 19:08:15 +0000 (19:08 +0000)]
Merge "Vold: Clean up code related to foreign dex use" am:
61a7d1a815
am:
aaa95fbdfe
Change-Id: I71276a5d18d6c81c97b6c31086a7d9eef47fece4
Calin Juravle [Tue, 7 Mar 2017 19:06:15 +0000 (19:06 +0000)]
Merge "Vold: Clean up code related to foreign dex use"
am:
61a7d1a815
Change-Id: I296f71434198c41c9ba340891efaf472e3d69dd6
Calin Juravle [Tue, 7 Mar 2017 19:00:18 +0000 (19:00 +0000)]
Merge "Vold: Clean up code related to foreign dex use"
Wei Wang [Tue, 7 Mar 2017 01:27:05 +0000 (17:27 -0800)]
vold: add coldboot back and make sure it won't block booting
coldboot is needed when device rebooted with USB device attched
so Vold netlink won't miss the information.
This CL added back coldboot and moved down so that it won't block
vold cl and ccl threads.
Bug:
36007238
Test: reboot marlin with flash drive attached and flash drive is recognized
Change-Id: Ie39f348e97a8500515e394e386541289a91b2425
Calin Juravle [Sat, 4 Mar 2017 01:51:35 +0000 (17:51 -0800)]
Vold: Clean up code related to foreign dex use
We simplified the way we track whether or not a dex file is used by
other apps. DexManger in the framework keeps track of the data and we
no longer need file markers on disk.
Test: device boots, foreign dex markers are not created anymore
Bug:
32871170
Change-Id: Id0360205b019be92049f36eab4339f4736e974f4
Isaac Chen [Wed, 15 Feb 2017 08:57:14 +0000 (08:57 +0000)]
Merge "Removed HW encryption build flags and related code." am:
bf8518056d am:
95dc636942
am:
730c6196a2
Change-Id: I3a24fffb05b8376f60d085f73354266cb4b4295d
Isaac Chen [Wed, 15 Feb 2017 08:54:13 +0000 (08:54 +0000)]
Merge "Removed HW encryption build flags and related code." am:
bf8518056d
am:
95dc636942
Change-Id: Id8db71142589232ec4342bb025761e645fd8dac2
Isaac Chen [Wed, 15 Feb 2017 08:51:13 +0000 (08:51 +0000)]
Merge "Removed HW encryption build flags and related code."
am:
bf8518056d
Change-Id: I969e9062b6c4d1827614d8272539489d26320f0d
Isaac Chen [Wed, 15 Feb 2017 08:45:29 +0000 (08:45 +0000)]
Merge "Removed HW encryption build flags and related code."
Isaac Chen [Tue, 14 Feb 2017 12:40:00 +0000 (20:40 +0800)]
Removed HW encryption build flags and related code.
TARGET_HW_DISK_ENCRYPTION and TARGET_CRYPTFS_HW_PATH build flags
and related code in cryptfs.c are removed since it doesn't match
the driver in current tree.
To enable HW encryption, the driver needs to be hidlized.
Bug:
34268168
Test: compile
Change-Id: I507a0e2908b3c407c565e44873b82c94a8305de6
George Burgess IV [Thu, 9 Feb 2017 04:20:46 +0000 (04:20 +0000)]
Merge "Add mode bits to open calls" am:
cebf7ea40f am:
385dae25c5
am:
94f2d7653c
Change-Id: I4c9671b6dbc9bce7ad0b8af8021301232aa491db
George Burgess IV [Thu, 9 Feb 2017 04:18:15 +0000 (04:18 +0000)]
Merge "Add mode bits to open calls" am:
cebf7ea40f
am:
385dae25c5
Change-Id: I715bc43c7df865f350162fdf620a354782304fdf
George Burgess IV [Thu, 9 Feb 2017 04:16:45 +0000 (04:16 +0000)]
Merge "Add mode bits to open calls"
am:
cebf7ea40f
Change-Id: I8620b354dc51f500edac492b94c0bf28852f5135
Treehugger Robot [Thu, 9 Feb 2017 04:12:36 +0000 (04:12 +0000)]
Merge "Add mode bits to open calls"
George Burgess IV [Wed, 25 Jan 2017 21:12:09 +0000 (13:12 -0800)]
Add mode bits to open calls
This was already done internally a while ago, but for us to submit
clang FORTIFY, we need it here, as well.
Bug:
32073964
Test: Clang FORTIFY no longer complains about open calls here.
Change-Id: I72428ac4d3279ffc330ae5aa579960c26703053c
Merged-In: Iaed2538831b19ada26005bbef33cff28209c6512
Wei Wang [Wed, 25 Jan 2017 19:50:28 +0000 (19:50 +0000)]
Merge "Remove coldboot from vold" am:
cc29c526d4 am:
9a2e29fe32
am:
78bf4cbb12
Change-Id: Idbeaf5ef67d59318507a83ad988a6dff45356b2b
Wei Wang [Wed, 25 Jan 2017 19:48:25 +0000 (19:48 +0000)]
Merge "Remove coldboot from vold" am:
cc29c526d4
am:
9a2e29fe32
Change-Id: I67f5eb8a7c1192449b11ffd7500222d6409d2f04
Wei Wang [Wed, 25 Jan 2017 19:45:53 +0000 (19:45 +0000)]
Merge "Remove coldboot from vold"
am:
cc29c526d4
Change-Id: I3de54db5f27692ab47ddf047ede056c536424438
Treehugger Robot [Wed, 25 Jan 2017 19:42:43 +0000 (19:42 +0000)]
Merge "Remove coldboot from vold"
Wei Wang [Fri, 20 Jan 2017 19:52:33 +0000 (11:52 -0800)]
Remove coldboot from vold
coldboot is now taken care by ueventd, so removing the duplicate
logic to save boottime.
This CL also fixes a missing lock.
Bug:
33786699
Test: manual
Change-Id: I71270252f3153abc815d142b5da7a9cb85b94dac
Dimitry Ivanov [Tue, 24 Jan 2017 02:20:33 +0000 (02:20 +0000)]
Fix deadlock between vold and init
am:
e74c3ea1e2
Change-Id: Ie6f7dc8ad70d76275d156ab76dab5806c197fc1b
Dimitry Ivanov [Thu, 19 Jan 2017 20:48:27 +0000 (12:48 -0800)]
Fix deadlock between vold and init
By setting property after listeners are initialized
we avoid deadlock between vold and init where
vold is waiting on property_service while init is blocked
(and therefore is not able to accept connections) on vdc
which is attempting to communicate with vold.
(This also speeds up boot by 250ms)
Test: Boot a device, check locks and make sure there is no timeout
on property_set(.)
Test: Successfully boot a device with new property service protocol.
Bug: http://b/
34278978
Change-Id: I9547d2f19cb35aa452bf01fbff0eb4b32a4824a4
(cherry picked from commit
c976e73bbdfd512482d0ea0c5e10afd53ba85e1e)
bowgotsai [Sat, 21 Jan 2017 12:59:23 +0000 (12:59 +0000)]
Merge "Include libavb in static libraries" am:
d65506217d am:
967f9715c3
am:
ab9218c64f
Change-Id: If433c6eec77fce2238838ebe0259b36d8a800c7d
bowgotsai [Sat, 21 Jan 2017 12:54:51 +0000 (12:54 +0000)]
Merge "Include libavb in static libraries" am:
d65506217d
am:
967f9715c3
Change-Id: I2d9d4ff414fe970a8be246a505487a2ea4037899
bowgotsai [Sat, 21 Jan 2017 12:50:51 +0000 (12:50 +0000)]
Merge "Include libavb in static libraries"
am:
d65506217d
Change-Id: I43dac19bf88cf4caa23f4fb3a47171b8c2adfeb6
Treehugger Robot [Sat, 21 Jan 2017 12:47:03 +0000 (12:47 +0000)]
Merge "Include libavb in static libraries"
Dimitry Ivanov [Fri, 20 Jan 2017 01:24:36 +0000 (01:24 +0000)]
Merge "Fix deadlock between vold and init" am:
ec58e5851d am:
b957474b61
am:
3577e4c351
Change-Id: Ifbc94b0160c828c05c72e405ce6318a1126b2c4e
Dimitry Ivanov [Fri, 20 Jan 2017 01:20:03 +0000 (01:20 +0000)]
Merge "Fix deadlock between vold and init" am:
ec58e5851d
am:
b957474b61
Change-Id: I18eb30a8cc47596561b5264dabcad135f6c13b5d
Dimitry Ivanov [Fri, 20 Jan 2017 01:14:04 +0000 (01:14 +0000)]
Merge "Fix deadlock between vold and init"
am:
ec58e5851d
Change-Id: I542e545ae363d53f8d13ef76356518f1fe089fc3
Treehugger Robot [Fri, 20 Jan 2017 01:06:49 +0000 (01:06 +0000)]
Merge "Fix deadlock between vold and init"
Dimitry Ivanov [Thu, 19 Jan 2017 20:48:27 +0000 (12:48 -0800)]
Fix deadlock between vold and init
By setting property after listeners are initialized
we avoid deadlock between vold and init where
vold is waiting on property_service while init is blocked
(and therefore is not able to accept connections) on vdc
which is attempting to communicate with vold.
(This also speeds up boot by 250ms)
Test: Boot a device, check locks and make sure there is no timeout
on property_set(.)
Test: Successfully boot a device with new property service protocol.
Bug: http://b/
34278978
Change-Id: I9547d2f19cb35aa452bf01fbff0eb4b32a4824a4
bowgotsai [Fri, 6 Jan 2017 16:44:35 +0000 (00:44 +0800)]
Include libavb in static libraries
Bug:
31264231
Test: compile
Change-Id: I1d84f7aa67a0ed31f2b6400cf1c9567bf503295a
Adrien Schildknecht [Sat, 3 Dec 2016 04:15:10 +0000 (04:15 +0000)]
Manually merge commit '
b406ffa' into stage-aosp-master am:
04c55e6ed7
am:
93722ead06
Change-Id: I25c4f8f2f833360b39939360ad400e6ed21fc176
Adrien Schildknecht [Sat, 3 Dec 2016 04:13:11 +0000 (04:13 +0000)]
Manually merge commit '
b406ffa' into stage-aosp-master
am:
04c55e6ed7
Change-Id: I77bbb46dfd8f49ed96c3f590d719b511eff55aa6
The Android Automerger [Sat, 3 Dec 2016 04:08:35 +0000 (04:08 +0000)]
Manually merge commit '
b406ffa' into stage-aosp-master
* commit '
b406ffa':
Add support for creating ext4 images with mke2fs
BUG:
33304034
Treehugger Robot [Fri, 2 Dec 2016 22:48:21 +0000 (22:48 +0000)]
Merge "Add support for creating ext4 images with mke2fs"
Adrien Schildknecht [Mon, 21 Nov 2016 23:14:37 +0000 (15:14 -0800)]
Add support for creating ext4 images with mke2fs
We are investigating replacing make_ext4fs with the upstream tool mke2fs.
See b/
23686092 for more informations.
To mitigate the trouble that may arise if the new tool behave differently
compared to the old one, there will be a transition period where both mke2fs
and make_ext4fs will be supported.
This patch does 3 things:
- add the necessary code to use mke2fs to format an ext4 partition;
- add a dependency to the binary used by vold.
Test: m -j32 with TARGET_USES_MKE2FS={,false,true}
TARGET_USERIMAGES_USE_EXT4={,true}
Change-Id: I89222642fe1d11a035155c8224b84b2e3719938b
Paul Crowley [Fri, 28 Oct 2016 21:25:23 +0000 (21:25 +0000)]
Merge "Remove misleading comment (b/
26948053)" am:
dbeebf56aa am:
4f70554179
am:
32b7443757
Change-Id: I8b68a90f11d2b7b66085609a122515a68bac48bb
Paul Crowley [Fri, 28 Oct 2016 21:20:28 +0000 (21:20 +0000)]
Merge "Remove misleading comment (b/
26948053)" am:
dbeebf56aa
am:
4f70554179
Change-Id: I18b4e8c975342a0b79d9a88082c1e9b4f0a6682b
Paul Crowley [Fri, 28 Oct 2016 21:14:50 +0000 (21:14 +0000)]
Merge "Remove misleading comment (b/
26948053)"
am:
dbeebf56aa
Change-Id: I6e63f700ecd9cad50956cc2a1cc34b4f81b1a497
Treehugger Robot [Fri, 28 Oct 2016 21:08:16 +0000 (21:08 +0000)]
Merge "Remove misleading comment (b/
26948053)"
Rahul Chaudhry [Thu, 20 Oct 2016 03:29:37 +0000 (03:29 +0000)]
Merge "system/vold: cleanup compiler warnings (read of uninitialized memory)." am:
cda5cec39f
am:
e9e23bf019
Change-Id: Ic4e45522f591c296f6975f288c5dccd059b00314
Rahul Chaudhry [Thu, 20 Oct 2016 03:21:06 +0000 (03:21 +0000)]
Merge "system/vold: cleanup compiler warnings (read of uninitialized memory)."
am:
cda5cec39f
Change-Id: I5fdde841ee42e3a48c042538732f22f0fe3eedf9
Treehugger Robot [Thu, 20 Oct 2016 03:15:24 +0000 (03:15 +0000)]
Merge "system/vold: cleanup compiler warnings (read of uninitialized memory)."
Rahul Chaudhry [Thu, 20 Oct 2016 00:58:32 +0000 (17:58 -0700)]
system/vold: cleanup compiler warnings (read of uninitialized memory).
system/vold/ScryptParameters.cpp:48:26: warning: Assigned value is
garbage or undefined
system/vold/ScryptParameters.cpp:48:43: warning: Assigned value is
garbage or undefined
system/vold/ScryptParameters.cpp:48:9: warning: Assigned value is
garbage or undefined
Bug:
26936282
Test: WITH_TIDY=1 WITH_STATIC_ANALYZER=1 mm
Change-Id: I82ffffee48ee94ca5c7f3bbc64059f9cec109a92
Paul Crowley [Wed, 19 Oct 2016 21:00:24 +0000 (14:00 -0700)]
Remove misleading comment (b/
26948053)
Vold is considered part of our trusted computing base, and
compromising vold is already identified as a complete device
compromise. While storing keys only in the kernel would be better, the
current setup does not introduce a security bug or worsen any security
control.
Bug:
26948053
Test: Comment-only change.
Change-Id: Ib5436f4386769ec44b74dc6b50fbcc0fed99b96b
Tao Bao [Tue, 18 Oct 2016 23:01:10 +0000 (23:01 +0000)]
Merge "Use libbootloader_message." am:
1dfd1df2e3
am:
df161ae45b
Change-Id: I028c7712fd243d7d291add1b2864a198959a1d34
Tao Bao [Tue, 18 Oct 2016 22:54:30 +0000 (22:54 +0000)]
Merge "Use libbootloader_message."
am:
1dfd1df2e3
Change-Id: Id9c27a97fc7a6e67a706d9f2d837e42a960fa19a
Tao Bao [Tue, 18 Oct 2016 21:48:22 +0000 (21:48 +0000)]
Merge "Use libbootloader_message."
Yabin Cui [Fri, 24 Jun 2016 21:48:49 +0000 (14:48 -0700)]
Use libbootloader_message.
Bug:
29582118
Change-Id: I8de2cfbc62908011dba2ab86d17f977ebcfadac0
(cherry picked from commit
1fb5966fbb4e05d15cb10ff371137b4ef9dff584)
Tao Bao [Mon, 10 Oct 2016 22:14:58 +0000 (22:14 +0000)]
Merge "Update the header path for ext4_utils." am:
6a18a6ddb5 am:
4759d1d637
am:
e85d4467f5
Change-Id: I78ef6034fc2586383e70345bcd186875528c9ffc
Tao Bao [Mon, 10 Oct 2016 21:46:17 +0000 (21:46 +0000)]
Merge "Update the header path for ext4_utils." am:
6a18a6ddb5
am:
4759d1d637
Change-Id: Ia2d03836b7c194f641aa2c75b113a0a87e84e397
Tao Bao [Mon, 10 Oct 2016 21:15:02 +0000 (21:15 +0000)]
Merge "Update the header path for ext4_utils."
am:
6a18a6ddb5
Change-Id: I9f82c4f612ce5287b24e53ef151b886b91b0a0d7
Tao Bao [Mon, 10 Oct 2016 20:07:32 +0000 (20:07 +0000)]
Merge "Update the header path for ext4_utils."
Tao Bao [Thu, 6 Oct 2016 01:01:19 +0000 (18:01 -0700)]
Update the header path for ext4_utils.
Test: mmma system/vold
Change-Id: I805b8874b05b8043390c2cd3c143cc469913c067
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: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 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."
OSDN Git Service
