OSDN Git Service
Ken Sumrall [Wed, 27 Mar 2013 21:15:55 +0000 (21:15 +0000)]
Merge "Vold: Add the fstrim subsystem to vold" into jb-mr2-dev
Ken Sumrall [Wed, 20 Mar 2013 04:46:39 +0000 (21:46 -0700)]
Vold: Add the fstrim subsystem to vold
The fstrim subsystem implements the dotrim command, which goes
through all the writable filesystems on the device, and invokes
the FITRIM ioctl() on them. This marks all the unused blocks on
the underlying flash device as unused, so the device performs better.
Change-Id: I5fc8c2f60e0bc823f162d0f89580fb288ecb2160
Jean-Baptiste Queru [Mon, 11 Mar 2013 20:44:17 +0000 (13:44 -0700)]
am
c004cfd8: am
b843601a: am
77acfc4d: (-s ours) am
3c73fdaa: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
c004cfd80c5b54c971b8854fa1d10ee23be1c868':
Jean-Baptiste Queru [Mon, 11 Mar 2013 20:06:39 +0000 (13:06 -0700)]
am
b843601a: am
77acfc4d: (-s ours) am
3c73fdaa: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
b843601a9de78a0015c8d963187efaa530e46d46':
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:47:14 +0000 (12:47 -0700)]
am
77acfc4d: (-s ours) am
3c73fdaa: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
77acfc4d6dc30f0b46ade8c6e12445065a2520eb':
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:28:04 +0000 (12:28 -0700)]
am
3c73fdaa: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
3c73fdaad106c2bd5e9d9349aae13f07ec40a547':
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:23:40 +0000 (12:23 -0700)]
Reconcile with jb-mr1-release - do not merge
Kenny Root [Wed, 27 Feb 2013 17:59:01 +0000 (17:59 +0000)]
am
bacdfc0e: Merge "Fix compiling warnings"
* commit '
bacdfc0ed9a0882ee3e9ee889a8fd4cabb9a71f3':
Fix compiling warnings
Kenny Root [Wed, 27 Feb 2013 16:57:14 +0000 (16:57 +0000)]
Merge "Fix compiling warnings"
Ken Sumrall [Wed, 13 Feb 2013 21:00:19 +0000 (13:00 -0800)]
vold: use unified fstab format
Change vold to use the unified fstab. This includes both
support for sdcards, and changes to the crypto code to work
with some changes to the fs_mgr library api.
Change-Id: Id5a8aa5b699afe151db6e31aa0d76105f9c95a80
Chih-Wei Huang [Sun, 10 Feb 2013 14:57:14 +0000 (22:57 +0800)]
Fix compiling warnings
The patch removes the following warnings:
system/vold/vdc.c: In function 'do_cmd':
system/vold/vdc.c:71:17: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
[...]
In file included from system/vold/Fat.cpp:34:0:
bionic/libc/kernel/common/linux/fs.h:109:0: warning: "MS_RMT_MASK" redefined [enabled by default]
In file included from system/vold/Fat.cpp:31:0:
bionic/libc/include/sys/mount.h:64:0: note: this is the location of the previous definition
[...]
Change-Id: I1e950dcec87f8bae0cec61a1611126b3abc0c90e
Ken Sumrall [Wed, 6 Feb 2013 01:39:48 +0000 (17:39 -0800)]
Enable allow_discards if dm-crypt supports it
dm-crypt version 1.11.0 and later supports the allow_discards option
when setting up a crypto device. This passes discard requests from
the filesytem to the underlying block device. This helps make flash
based storage faster. So query the dm-crypt version, and pass the
option if the version is 1.11.0 or greater.
Change-Id: If30e9db5a2dbd6ea0281d91344e5b2c35e75131e
Rom Lemarchand [Wed, 16 Jan 2013 20:29:28 +0000 (12:29 -0800)]
Replace custom logwrapper implementation with liblogwrap
Use liblogwrap to provide logwrapper functionality instead of
using vold's own implementation.
Change-Id: I76aac5aa72a1fdca043a63b86c6a9b54e7abec16
Rom Lemarchand [Fri, 21 Dec 2012 20:41:43 +0000 (12:41 -0800)]
Fix calls to logwrap
Make sure all the calls to logwrap are consistent with the function's
semantics.
Change-Id: Ib0e2ad5c283cc4bb06c0ef5d6a9a52a5840b3dd2
Rom Lemarchand [Thu, 27 Dec 2012 18:45:02 +0000 (10:45 -0800)]
Ensure vold doesn't hang when a child process dies
Add a monitoring thread that notifies the main parent thread when the child
process terminates. The return code from the child is then propagated back up
to the parent.
Change-Id: Idf46e100e8dee2e8f1aaa331317f3c4955632183
Rom Lemarchand [Fri, 21 Dec 2012 19:35:43 +0000 (11:35 -0800)]
Make sure to exit with _exit from child
Exiting the child process with _exit after forking but before exec.
Change-Id: I5df34242c5444b6de6a559735074737d370a6a2e
Dianne Hackborn [Wed, 28 Nov 2012 19:20:19 +0000 (11:20 -0800)]
am
16a32502: am
3fd60b42: Fix issue #
7503920: Log spew from vold
* commit '
16a32502bf98b4b0fc15a82a36242fada29baf5b':
Fix issue #
7503920: Log spew from vold
Dianne Hackborn [Wed, 28 Nov 2012 19:18:10 +0000 (11:18 -0800)]
am
3fd60b42: Fix issue #
7503920: Log spew from vold
* commit '
3fd60b428202a0f5f324fccc67c0c0402b9131ba':
Fix issue #
7503920: Log spew from vold
Dianne Hackborn [Wed, 28 Nov 2012 00:00:04 +0000 (16:00 -0800)]
Fix issue #
7503920: Log spew from vold
Change-Id: Ibfa5b979014f433085b94aab0d3d81bf9269d4b5
The Android Open Source Project [Tue, 6 Nov 2012 20:31:15 +0000 (12:31 -0800)]
am
b1596afa: (-s ours) am
b7afc4e1: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
b1596afa59c7108cc6ce23bab54a1bc41961806a':
The Android Open Source Project [Tue, 6 Nov 2012 20:27:10 +0000 (12:27 -0800)]
am
b7afc4e1: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
b7afc4e15b29d933477328d1944c3201337808c6':
The Android Open Source Project [Tue, 6 Nov 2012 20:19:27 +0000 (12:19 -0800)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I8de173f6b24b2f82b20e568e577878d8539e5148
The Android Open Source Project [Wed, 31 Oct 2012 16:23:14 +0000 (09:23 -0700)]
am
10b8e684: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
10b8e684e1945edfb60ec4391ac4c7f3d8bf4172':
The Android Open Source Project [Wed, 31 Oct 2012 16:19:05 +0000 (09:19 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Ic3c4a57147bc3a4154c140beeeed27b5e3be9ece
Elliott Hughes [Tue, 30 Oct 2012 17:11:34 +0000 (10:11 -0700)]
am
29e55ef8: am
edf4e179: Merge "Fix vold\'s use of readdir_r(3)."
* commit '
29e55ef83def8eaf6aa01201c6344a8037b2f780':
Fix vold's use of readdir_r(3).
Elliott Hughes [Tue, 30 Oct 2012 00:15:00 +0000 (17:15 -0700)]
am
edf4e179: Merge "Fix vold\'s use of readdir_r(3)."
* commit '
edf4e17940c6d3887e9009b23ffca5be8116fbe9':
Fix vold's use of readdir_r(3).
Elliott Hughes [Sat, 27 Oct 2012 00:25:46 +0000 (17:25 -0700)]
Merge "Fix vold's use of readdir_r(3)."
Elliott Hughes [Fri, 26 Oct 2012 23:57:19 +0000 (16:57 -0700)]
Fix vold's use of readdir_r(3).
Change-Id: I805a1799755429dd1f6f3bdc2e6a02f483587b35
Nick Kralevich [Fri, 19 Oct 2012 18:12:44 +0000 (11:12 -0700)]
am
2e0d70f9: am
678d556f: Merge "Add snprintf truncation and output error checks."
* commit '
2e0d70f98d10089f0cc3b88848d203cb4694fb98':
Add snprintf truncation and output error checks.
Nick Kralevich [Fri, 19 Oct 2012 18:09:59 +0000 (11:09 -0700)]
am
678d556f: Merge "Add snprintf truncation and output error checks."
* commit '
678d556f439cae504c343c15d77e9ec020a9385c':
Add snprintf truncation and output error checks.
Nick Kralevich [Fri, 19 Oct 2012 17:49:24 +0000 (10:49 -0700)]
Merge "Add snprintf truncation and output error checks."
rpcraig [Tue, 9 Oct 2012 10:58:16 +0000 (06:58 -0400)]
Add snprintf truncation and output error checks.
Change-Id: If7fc9bba4b6cd4b01d2c19e967105ffc57169e97
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
The Android Automerger [Thu, 18 Oct 2012 14:00:15 +0000 (07:00 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Ken Sumrall [Thu, 18 Oct 2012 04:24:13 +0000 (21:24 -0700)]
am
05753f53: am
92736efa: Another fix for encryption
* commit '
05753f5380e4bc678ae9bf11b8b6adb6c56f33bf':
Another fix for encryption
Ken Sumrall [Thu, 18 Oct 2012 04:21:11 +0000 (21:21 -0700)]
am
92736efa: Another fix for encryption
* commit '
92736efab068bdbfeb1177544907b84511fb04e0':
Another fix for encryption
Ken Sumrall [Thu, 18 Oct 2012 03:57:14 +0000 (20:57 -0700)]
Another fix for encryption
The previous problem of the framework not properly restarting after accepting
the password to decrypt the storage is also a problem when restarting the
framework to display the encryption progress screen. So like the previous
hacky fix, add a sleep to wait a few moments before proceeding. Also,
increase the sleep of the previous fix from 1 second to 2, as the problem
was seen once more in testing. A proper fix has been designed and hopefully
will work and be checked-in RSN.
Change-Id: Icc2c072ce7f7ebcdea22cd7ff8cb2b87a627c578
Kenny Root [Wed, 17 Oct 2012 20:01:59 +0000 (13:01 -0700)]
am
bb67b67c: am
fd5b29be: Merge "Extend vold support for creating ext4 images."
* commit '
bb67b67cc760e4eab8a144d1ce1df9ad2dcdc8c2':
Extend vold support for creating ext4 images.
Kenny Root [Wed, 17 Oct 2012 19:58:57 +0000 (12:58 -0700)]
am
fd5b29be: Merge "Extend vold support for creating ext4 images."
* commit '
fd5b29be8c572058ed9ab0198f5603e96c585d3c':
Extend vold support for creating ext4 images.
Kenny Root [Wed, 17 Oct 2012 18:53:40 +0000 (11:53 -0700)]
Merge "Extend vold support for creating ext4 images."
The Android Open Source Project [Wed, 10 Oct 2012 16:48:04 +0000 (09:48 -0700)]
am
4fdf09c3: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
4fdf09c3103074770675b40c9fb5e47c04617c61':
Fix encryption on certain devices
The Android Open Source Project [Wed, 10 Oct 2012 16:46:07 +0000 (09:46 -0700)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: Ifffd0bab9123c37df7c9abdbf166e32ca9850835
Ken Sumrall [Tue, 9 Oct 2012 21:16:59 +0000 (14:16 -0700)]
Fix encryption on certain devices
There is a race in the encryption code that after it accepts the
decryption password, it tells init to kill all the processes in
class "main", then it mounts the decrypted filesystem, preps it,
and restarts the framework. For an unknown reason on some devices,
the new framework sometimes starts up before init has killed and
reaped all the old processes. The proper fix is to make the killing
of the old framework synchronous, so vold waits till all the
processes have died. But with factory rom a few days away, the
much more pragmatic solution of adding a sleep of 1 second after
telling init to kill the old framework will suffice.
Bug:
7271212
Change-Id: Ie971cd04abbc6f3f6500b4acd79d3b3b26d9561c
Ken Sumrall [Tue, 9 Oct 2012 22:12:57 +0000 (15:12 -0700)]
am
06dbc228: am
9dedfd47: Fix encryption on certain devices
* commit '
06dbc22839ff8e411405f6b9c0635cdd0fd8b4d5':
Fix encryption on certain devices
Ken Sumrall [Tue, 9 Oct 2012 22:11:18 +0000 (15:11 -0700)]
am
9dedfd47: Fix encryption on certain devices
* commit '
9dedfd473dc59e0277004e5b917e4eced02c8af5':
Fix encryption on certain devices
Ken Sumrall [Tue, 9 Oct 2012 21:16:59 +0000 (14:16 -0700)]
Fix encryption on certain devices
There is a race in the encryption code that after it accepts the
decryption password, it tells init to kill all the processes in
class "main", then it mounts the decrypted filesystem, preps it,
and restarts the framework. For an unknown reason on some devices,
the new framework sometimes starts up before init has killed and
reaped all the old processes. The proper fix is to make the killing
of the old framework synchronous, so vold waits till all the
processes have died. But with factory rom a few days away, the
much more pragmatic solution of adding a sleep of 1 second after
telling init to kill the old framework will suffice.
Bug:
7271212
Change-Id: Ie971cd04abbc6f3f6500b4acd79d3b3b26d9561c
The Android Open Source Project [Tue, 9 Oct 2012 14:35:36 +0000 (07:35 -0700)]
am
f1e72279: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
f1e72279ffbff47ef404e8f7d8c9bd7306f8382d':
The Android Open Source Project [Tue, 9 Oct 2012 14:31:11 +0000 (07:31 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Iac520484dec44e5f54fe0aca54010520aa8fd7e2
The Android Automerger [Sun, 7 Oct 2012 14:00:08 +0000 (07:00 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jeff Sharkey [Fri, 5 Oct 2012 22:32:27 +0000 (15:32 -0700)]
am
762f7268: am
7a3c3d46: Unmount in-place instead of using MS_MOVE.
* commit '
762f7268255f13e1c875977ce5429ced8bfaead7':
Unmount in-place instead of using MS_MOVE.
Jeff Sharkey [Fri, 5 Oct 2012 22:30:28 +0000 (15:30 -0700)]
am
7a3c3d46: Unmount in-place instead of using MS_MOVE.
* commit '
7a3c3d462ebd58bda0ceaba9c00c385d44c13d08':
Unmount in-place instead of using MS_MOVE.
Jeff Sharkey [Thu, 4 Oct 2012 23:49:22 +0000 (16:49 -0700)]
Unmount in-place instead of using MS_MOVE.
To support multi-user emulated storage, we mount rootfs as MS_SHARED,
which means we can't MS_MOVE existing mount points rooted in the
shared subtree. Initial staging is still able to MS_MOVE, since it's
rooted in a MS_PRIVATE tmpfs rooted at /mnt/secure.
This change fixes unmounting by operating in-place instead of trying
(and failing) to MS_MOVE back to staging.
Bug:
7127564
Change-Id: I4783db4319b61c0915da39361cbc7e8f4943d094
The Android Open Source Project [Tue, 2 Oct 2012 16:24:42 +0000 (09:24 -0700)]
am
3aeec65f: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
3aeec65f6398183ea8dd086f4d33cbc32cbce8c7':
Update environment variable for multi-user.
The Android Open Source Project [Tue, 2 Oct 2012 16:21:07 +0000 (09:21 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I4024b1fab0705f6b943ef6b0633ad9e29beacb73
Jeff Sharkey [Mon, 1 Oct 2012 21:36:26 +0000 (14:36 -0700)]
Update environment variable for multi-user.
Bug:
7260040
Change-Id: I96d821e11a3f0be32bfe92a4151f00f2b15d100e
Jeff Sharkey [Mon, 1 Oct 2012 21:46:31 +0000 (14:46 -0700)]
am
700b8cf8: am
b77bc469: Update environment variable for multi-user.
* commit '
700b8cf87ee70fa5cba9ee09669aad07f983055a':
Update environment variable for multi-user.
Jeff Sharkey [Mon, 1 Oct 2012 21:44:28 +0000 (14:44 -0700)]
am
b77bc469: Update environment variable for multi-user.
* commit '
b77bc4696b19d9b1ef82810f8d5f671c963d1dc1':
Update environment variable for multi-user.
Jeff Sharkey [Mon, 1 Oct 2012 21:36:26 +0000 (14:36 -0700)]
Update environment variable for multi-user.
Bug:
7260040
Change-Id: I96d821e11a3f0be32bfe92a4151f00f2b15d100e
Ken Sumrall [Mon, 1 Oct 2012 20:45:18 +0000 (13:45 -0700)]
am
aba1f4d5: am
e919efea: Workaround a kernel race when loading dmcrypt table
* commit '
aba1f4d5593f153eac63e983d56ac36f03663a3d':
Workaround a kernel race when loading dmcrypt table
Ken Sumrall [Mon, 1 Oct 2012 17:14:58 +0000 (10:14 -0700)]
am
e919efea: Workaround a kernel race when loading dmcrypt table
* commit '
e919efea94b178ed214ed2e78ef0d008727d62ab':
Workaround a kernel race when loading dmcrypt table
The Android Automerger [Mon, 1 Oct 2012 01:18:02 +0000 (18:18 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Ken Sumrall [Sun, 30 Sep 2012 00:07:41 +0000 (17:07 -0700)]
Workaround a kernel race when loading dmcrypt table
The kernel seems to return from umount(2) sometimes before it has
released the underlying block device. So until the kernel is fixed,
try up to 10 times to load the crypto mapping table, waiting 500 ms
between tries.
bug:
7220345
Change-Id: Iad3bbef37cbe2e01613bb8a8c4886babdecb8328
The Android Open Source Project [Wed, 26 Sep 2012 17:07:39 +0000 (10:07 -0700)]
am
4e9fb840: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
4e9fb84063a2ad84df45ade41d301ec3aaf06160':
The Android Open Source Project [Wed, 26 Sep 2012 16:09:05 +0000 (09:09 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I1071ef79a7f5080b822cc4032647ea1feacd5d12
The Android Automerger [Wed, 26 Sep 2012 14:00:30 +0000 (07:00 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jeff Sharkey [Wed, 26 Sep 2012 00:55:57 +0000 (17:55 -0700)]
am
9f413b77: am
6947904a: Handle multi-user mountObb() requests.
* commit '
9f413b77b05998b2dfe831d8752ba952f524b9ba':
Handle multi-user mountObb() requests.
Jeff Sharkey [Wed, 26 Sep 2012 00:54:22 +0000 (17:54 -0700)]
am
6947904a: Handle multi-user mountObb() requests.
* commit '
6947904a76b69a1db20a3ddd30c0bcd281922fde':
Handle multi-user mountObb() requests.
Jeff Sharkey [Tue, 25 Sep 2012 23:14:57 +0000 (16:14 -0700)]
Handle multi-user mountObb() requests.
Mount OBB containers using shared app GID, so that an app can read
the mount point across users.
Bug:
7212801
Change-Id: Ia1be52df9854c259b20728111f3a2c9facf4beaa
Elliott Hughes [Tue, 25 Sep 2012 19:33:32 +0000 (12:33 -0700)]
am
5695b4bb: am
f7e7ee96: am
2d1e5e96: Merge "Extend the maximum number of partitions from 4 to 32"
* commit '
5695b4bb1c87a5c6ca884262f7940526ddcc5883':
Extend the maximum number of partitions from 4 to 32
Elliott Hughes [Tue, 25 Sep 2012 19:30:15 +0000 (12:30 -0700)]
am
f7e7ee96: am
2d1e5e96: Merge "Extend the maximum number of partitions from 4 to 32"
* commit '
f7e7ee969d9f286315ff153cb979e29e08cee9f4':
Extend the maximum number of partitions from 4 to 32
Elliott Hughes [Tue, 25 Sep 2012 19:26:08 +0000 (12:26 -0700)]
am
2d1e5e96: Merge "Extend the maximum number of partitions from 4 to 32"
* commit '
2d1e5e9680dcd29628f100c172e6d7d17d90ef2a':
Extend the maximum number of partitions from 4 to 32
Elliott Hughes [Tue, 25 Sep 2012 17:19:42 +0000 (10:19 -0700)]
Merge "Extend the maximum number of partitions from 4 to 32"
rpcraig [Fri, 21 Sep 2012 18:17:08 +0000 (14:17 -0400)]
Extend vold support for creating ext4 images.
Augment the Ext4::format function to take
a mountpoint parameter. This will then
be passed to make_ext4fs through the
-a option to allow proper security labeling.
Change-Id: Ic26703406a2c463c12e32c8103a0c75c727b7d29
Hirofumi Ando [Tue, 8 Mar 2011 04:51:22 +0000 (13:51 +0900)]
Extend the maximum number of partitions from 4 to 32
Some platforms needs more than 4 partitions, e.g. the lt26.
Change-Id: Id22125313824b0ae15a4596709f52c4ab609a542
The Android Open Source Project [Sat, 25 Aug 2012 14:21:27 +0000 (07:21 -0700)]
am
cd7ab371: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
cd7ab371fc070206a030d298d896061458704abd':
Unmount external storage on multi-user devices.
The Android Open Source Project [Sat, 25 Aug 2012 14:18:22 +0000 (07:18 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I91572ae0a96d0f7450b8afff1b32167c8dd0c086
Jeff Sharkey [Thu, 23 Aug 2012 21:08:59 +0000 (14:08 -0700)]
Unmount external storage on multi-user devices.
Bug:
7044670
Change-Id: If1f99968b0392cae9420d067c75bfc18d1067b2c
Jeff Sharkey [Thu, 23 Aug 2012 21:15:00 +0000 (14:15 -0700)]
am
7382f81f: Unmount external storage on multi-user devices.
* commit '
7382f81fba895f1ac970ac2fad875f35836b8082':
Unmount external storage on multi-user devices.
Jeff Sharkey [Thu, 23 Aug 2012 21:08:59 +0000 (14:08 -0700)]
Unmount external storage on multi-user devices.
Bug:
7044670
Change-Id: If1f99968b0392cae9420d067c75bfc18d1067b2c
The Android Open Source Project [Fri, 17 Aug 2012 02:06:47 +0000 (19:06 -0700)]
am
f763b2fc: (-s ours) am
7c5109be: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '
f763b2fc07ee79045ca6c47e54d09dec90694e6c':
The Android Open Source Project [Fri, 17 Aug 2012 01:59:13 +0000 (18:59 -0700)]
am
7c5109be: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '
7c5109bef8c1f8b857b043bf9c1d26c2f0556e8f':
The Android Open Source Project [Fri, 17 Aug 2012 01:57:10 +0000 (18:57 -0700)]
Reconcile with jb-mr0-release - do not merge
Change-Id: I3ec7be5d1d08566f120f18b68d2f691f92f006c8
The Android Automerger [Fri, 17 Aug 2012 00:57:55 +0000 (17:57 -0700)]
merge in jb-mr0-release history after reset to jb-dev
Kenny Root [Mon, 13 Aug 2012 18:50:53 +0000 (11:50 -0700)]
am
4fe053e1: (-s ours) am
62224a32: (-s ours) am
eacf7e03: Only cleanup ASECs in external storage DO NOT MERGE
* commit '
4fe053e1b406b41b5a60707523b389530619d953':
Only cleanup ASECs in external storage DO NOT MERGE
Kenny Root [Mon, 13 Aug 2012 18:45:38 +0000 (11:45 -0700)]
am
62224a32: (-s ours) am
eacf7e03: Only cleanup ASECs in external storage DO NOT MERGE
* commit '
62224a32f00c344c8ba6edab2107c833700e26a8':
Only cleanup ASECs in external storage DO NOT MERGE
Kenny Root [Mon, 13 Aug 2012 18:42:56 +0000 (11:42 -0700)]
am
eacf7e03: Only cleanup ASECs in external storage DO NOT MERGE
* commit '
eacf7e03d60a2b33ac6cdaa0e01bd6a6fdd9455a':
Only cleanup ASECs in external storage DO NOT MERGE
Kenny Root [Thu, 9 Aug 2012 18:28:37 +0000 (11:28 -0700)]
Only cleanup ASECs in external storage DO NOT MERGE
Any ASEC or OBB files were unmounted when USB storage was set to UMS
mode. This changes it so only ASEC files on external storage and OBB
files mounted from external storage are unmounted.
(Cherry-pick of
93ecb38daded7583a4a61f4f22519bb7a8a8c154)
Bug:
6948035
Change-Id: Ib60727bd360caa32173797ff5b4e1e21fcf20054
Kenny Root [Thu, 9 Aug 2012 18:28:37 +0000 (11:28 -0700)]
Only cleanup ASECs in external storage
Any ASEC or OBB files were unmounted when USB storage was set to UMS
mode. This changes it so only ASEC files on external storage and OBB
files mounted from external storage are unmounted.
Bug:
6948035
Change-Id: I91bc09ee5b792970b0eef895f6886f3ffad00e8f
Ken Sumrall [Fri, 29 Jun 2012 00:58:50 +0000 (17:58 -0700)]
Merge "Fix a typo in cryptfs.c"
Ken Sumrall [Wed, 27 Jun 2012 23:30:18 +0000 (16:30 -0700)]
Fix a typo in cryptfs.c
Change-Id: If629fa996b135e432bc89da7518b0c1f02750b45
Nick Kralevich [Tue, 26 Jun 2012 22:07:03 +0000 (15:07 -0700)]
Add mode when open(O_CREAT) is used.
When creating a new file using open(..., O_CREAT), it is an error
to fail to specify a creation mode. If a mode is not specified, a
random stack provided value is used as the "mode".
This will become a compile error in a future Android change.
Change-Id: I761708c001247d7a2faac2e286288b45bfecc6f7
The Android Open Source Project [Tue, 19 Jun 2012 13:20:12 +0000 (06:20 -0700)]
am
9ee8a315: Reconcile with jb-release
* commit '
9ee8a315eefde7e6ad1bc07bc9d50528f548e8e8':
Unmount all asec apps before encrypting
The Android Open Source Project [Tue, 19 Jun 2012 13:13:59 +0000 (06:13 -0700)]
Reconcile with jb-release
Change-Id: I60294fb5c41ef34eccc322889168497d9449c6ea
Ken Sumrall [Mon, 18 Jun 2012 17:52:20 +0000 (10:52 -0700)]
am
a7926050: am
425524db: Unmount all asec apps before encrypting
* commit '
a79260500a869f867118a6e5289c6e5a0353558f':
Unmount all asec apps before encrypting
Ken Sumrall [Mon, 18 Jun 2012 17:32:48 +0000 (10:32 -0700)]
am
425524db: Unmount all asec apps before encrypting
* commit '
425524dba1552ab3d2ad39e205e65d0a2af997f2':
Unmount all asec apps before encrypting
Ken Sumrall [Fri, 15 Jun 2012 03:55:28 +0000 (20:55 -0700)]
Unmount all asec apps before encrypting
Now that forward locked apps are stored on /data as asec image files
that are mounted, they need to be unmounted before /data can be unmounted
so it can be encrypted.
Change-Id: I7c87deb52aaed21c8ad8ce8aceb7c15c2338620a
Ken Sumrall [Fri, 15 Jun 2012 03:55:28 +0000 (20:55 -0700)]
Unmount all asec apps before encrypting
Now that forward locked apps are stored on /data as asec image files
that are mounted, they need to be unmounted before /data can be unmounted
so it can be encrypted.
Change-Id: I7c87deb52aaed21c8ad8ce8aceb7c15c2338620a
Jean-Baptiste Queru [Tue, 22 May 2012 14:46:42 +0000 (07:46 -0700)]
am
e925ff66: am
bac5eb96: Merge "Delay disk inserted broadcast until disk is ready"
* commit '
e925ff6670bb9cef9118ddceb2e3bff81833bd09':
Delay disk inserted broadcast until disk is ready
Jean-Baptiste Queru [Tue, 22 May 2012 14:44:54 +0000 (07:44 -0700)]
am
bac5eb96: Merge "Delay disk inserted broadcast until disk is ready"
* commit '
bac5eb966c5c3aa9abe83cdb5187326f422741ab':
Delay disk inserted broadcast until disk is ready
Jean-Baptiste Queru [Tue, 22 May 2012 14:25:51 +0000 (07:25 -0700)]
Merge "Delay disk inserted broadcast until disk is ready"
The Android Open Source Project [Wed, 16 May 2012 15:46:29 +0000 (08:46 -0700)]
am
2fdea0aa: Reconcile with jb-release nakasi-factoryrom-release
* commit '
2fdea0aa78cefce50c6f51be97084977f2a6ae69':
Native library loading needs to read directory
Only set permissions on dirs or files
Fix truncation of ASEC ids