OSDN Git Service
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 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: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: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 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: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: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: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: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: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: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 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 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: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: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: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: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 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: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
The Android Open Source Project [Wed, 16 May 2012 15:41:18 +0000 (08:41 -0700)]
Reconcile with jb-release nakasi-factoryrom-release
Change-Id: I2bc2763dc285edb9aa8bd9bedd068ee4483a3ce5
The Android Automerger [Mon, 14 May 2012 14:06:23 +0000 (07:06 -0700)]
merge in jb-release history after reset to jb-dev
Kenny Root [Fri, 11 May 2012 06:36:13 +0000 (23:36 -0700)]
am
760cec44: am
41836711: Merge "Sleep to wait for dm to create node" into jb-dev
* commit '
760cec444b0f3c8a243d100cd5f5520af7531d17':
Sleep to wait for dm to create node
Kenny Root [Fri, 11 May 2012 06:32:27 +0000 (23:32 -0700)]
am
41836711: Merge "Sleep to wait for dm to create node" into jb-dev
* commit '
418367112c96f6ce45aa142d613a575046b7f65f':
Sleep to wait for dm to create node
Kenny Root [Fri, 11 May 2012 06:30:35 +0000 (23:30 -0700)]
Merge "Sleep to wait for dm to create node" into jb-dev
Kenny Root [Thu, 10 May 2012 23:45:29 +0000 (16:45 -0700)]
Native library loading needs to read directory
When calling System.loadLibrary(), it needs to be able to read the
directory to load the file. We could probably fix that, but changing
permissions here is faster.
Bug:
6478606
Change-Id: I296b0805839da5a19950157f9a16755a4d258ca8
Kenny Root [Thu, 10 May 2012 22:39:53 +0000 (15:39 -0700)]
Only set permissions on dirs or files
Traversal would mark directories with the correct permissions, but
they're visited again in post-order which is a different fts_info flag.
Then it would set that to regular file permissions.
Explicitly check to make sure we're looking at a file instead.
Bug:
6478606
Change-Id: I13cab3e69f451da6a994fa974d575ef366f82025
Kenny Root [Thu, 3 May 2012 20:49:46 +0000 (13:49 -0700)]
Sleep to wait for dm to create node
There appears to be a race condition from when the device mapper is
asked to create a device and when it actually appears. When we moved
ASECs to use Ext4, mount started winning the race more often.
Just insert a sleep-retry loop here to counter-act this race. We should
ideally look at the uevent replies, but it takes a bit more effort to
separate them out.
Change-Id: Ie8a5b36b1c9a26f2320a178d37312059d03a1281
Kenny Root [Thu, 10 May 2012 23:59:18 +0000 (16:59 -0700)]
am
9688165c: am
1a673c86: Native library loading needs to read directory
* commit '
9688165c81a1ab4c2ce08fc831030eebcf2ecc6f':
Native library loading needs to read directory
Kenny Root [Thu, 10 May 2012 23:56:35 +0000 (16:56 -0700)]
am
1a673c86: Native library loading needs to read directory
* commit '
1a673c868c2d2d81fcaeab34b4a7c75d4a978584':
Native library loading needs to read directory
Kenny Root [Thu, 10 May 2012 23:48:16 +0000 (16:48 -0700)]
am
457197c5: am
348c8aba: Only set permissions on dirs or files
* commit '
457197c50056216c1552e020998274a3bb249dd9':
Only set permissions on dirs or files
Kenny Root [Thu, 10 May 2012 23:45:29 +0000 (16:45 -0700)]
Native library loading needs to read directory
When calling System.loadLibrary(), it needs to be able to read the
directory to load the file. We could probably fix that, but changing
permissions here is faster.
Bug:
6478606
Change-Id: I296b0805839da5a19950157f9a16755a4d258ca8
Kenny Root [Thu, 10 May 2012 23:46:37 +0000 (16:46 -0700)]
am
348c8aba: Only set permissions on dirs or files
* commit '
348c8aba0d2df2996e0fe57900ef518c6aeb4b29':
Only set permissions on dirs or files
Kenny Root [Thu, 10 May 2012 22:39:53 +0000 (15:39 -0700)]
Only set permissions on dirs or files
Traversal would mark directories with the correct permissions, but
they're visited again in post-order which is a different fts_info flag.
Then it would set that to regular file permissions.
Explicitly check to make sure we're looking at a file instead.
Bug:
6478606
Change-Id: I13cab3e69f451da6a994fa974d575ef366f82025
Jean-Baptiste Queru [Tue, 8 May 2012 22:13:22 +0000 (15:13 -0700)]
am
0e110bb5: am
5cf6325c: Merge "Unshare ums when SD card is removed"
* commit '
0e110bb5a2559b60003effa0e0bf460993e634a6':
Unshare ums when SD card is removed
Jean-Baptiste Queru [Tue, 8 May 2012 20:39:20 +0000 (13:39 -0700)]
am
5cf6325c: Merge "Unshare ums when SD card is removed"
* commit '
5cf6325c91792dbb1bb08fa1958c1fc8a5b9c45d':
Unshare ums when SD card is removed
Jean-Baptiste Queru [Tue, 8 May 2012 16:55:55 +0000 (09:55 -0700)]
Merge "Unshare ums when SD card is removed"
Magnus Malmborn [Wed, 19 Jan 2011 11:26:52 +0000 (12:26 +0100)]
Delay disk inserted broadcast until disk is ready
Delay sending of "VolumeDiskInserted" broadcast until the disk is
ready (ie until all the partitions have been received from
kernel). This solves a race with MountService, otherwise there is a
risk that MountService tries to mount the SD-card before the
partition(s) have been received and the card will fail to mount.
Change-Id: Ie2a28227ae9a7d6fe9106fb6875f469a0e899014
Lars Svensson [Thu, 7 Apr 2011 13:17:43 +0000 (15:17 +0200)]
Unshare ums when SD card is removed
If SD card is removed without unmounting when in USB mass storage mode
the ums share is not properly closed and the device files 179:0 and 179:1
are left in use. This causes erratic behaviour on subsequent operations on
the card, i.e. mounting and formatting will fail.
Change-Id: I757703c6282f4b76e2d8b027f4644920737309b6
The Android Automerger [Wed, 2 May 2012 14:14:05 +0000 (07:14 -0700)]
merge in jb-release history after reset to jb-dev
Ken Sumrall [Tue, 1 May 2012 21:04:56 +0000 (14:04 -0700)]
am
e5032c42: Changes to encryption to work with the new filesystem manager
* commit '
e5032c42da3c33a854df0a24a7968b4ab54190b9':
Changes to encryption to work with the new filesystem manager
Ken Sumrall [Mon, 2 Apr 2012 06:58:44 +0000 (23:58 -0700)]
Changes to encryption to work with the new filesystem manager
The new filesystem manager is in charge of mounting the block devices now,
removing much of the knowledge from init.<device>.rc. This also let us
clean up some init code dealing with encryption, so this change updates
vold to work with that. More cleanup is possible, but the main goal of the
filesystem manager was to enable e2fsck, not a full cleanup of encryption.
Change-Id: I00ea80a923d14770ed8fdd190e8840be195f8514
Ken Sumrall [Mon, 2 Apr 2012 06:58:44 +0000 (23:58 -0700)]
Changes to encryption to work with the new filesystem manager
The new filesystem manager is in charge of mounting the block devices now,
removing much of the knowledge from init.<device>.rc. This also let us
clean up some init code dealing with encryption, so this change updates
vold to work with that. More cleanup is possible, but the main goal of the
filesystem manager was to enable e2fsck, not a full cleanup of encryption.
Change-Id: I00ea80a923d14770ed8fdd190e8840be195f8514
Kenny Root [Fri, 27 Apr 2012 22:33:58 +0000 (15:33 -0700)]
Fix truncation of ASEC ids
Change-Id: I1e6bfcc6b0a5be47e6fd19922fc81669f61b5dba
Kenny Root [Fri, 27 Apr 2012 22:33:58 +0000 (15:33 -0700)]
Fix truncation of ASEC ids
Change-Id: I1e6bfcc6b0a5be47e6fd19922fc81669f61b5dba
Kenny Root [Wed, 4 Apr 2012 00:23:01 +0000 (17:23 -0700)]
Add in ext4 support for ASEC containers
Now forward locked applications will be in ASEC containers both internal
to the system and externally.
This change adds support for putting applications in ext4-based ASECs.
Change-Id: I8d6765b72dd2606e429c067b47a2dbcaa8bef37d
Mike Lockwood [Wed, 21 Mar 2012 22:45:48 +0000 (15:45 -0700)]
Merge remote-tracking branch 'goog/ics-aah-exp'
Mike Lockwood [Wed, 21 Mar 2012 22:44:48 +0000 (15:44 -0700)]
Merge commit '
43b80c229bdee7f32654e2ec561078c5c94c8851'
empty merge with -s ours
Change-Id: I4c7d6fb13e175af819cab784704e08e9189f6739
Ken Sumrall [Sat, 10 Mar 2012 01:02:58 +0000 (17:02 -0800)]
Merge "Fix vdc to add sequence number for NativeConectorDaemon"
Ken Sumrall [Sat, 10 Mar 2012 01:02:44 +0000 (17:02 -0800)]
Merge "Fix to not return a bogus decryption error when a device is not encrypted."
Ken Sumrall [Sat, 10 Mar 2012 00:48:48 +0000 (16:48 -0800)]
Fix vdc to add sequence number for NativeConectorDaemon
NativeConnectorDaemon was changed to use an optional sequence number,
and most services were changed to require it. Now that vold requires
a sequence number, vdc must provide one.
Change-Id: Ibdff9878faf19eae25525221c80bcb5e5f87cfea
Glenn Kasten [Wed, 7 Mar 2012 15:15:48 +0000 (07:15 -0800)]
Merge "Use sched_policy to avoid hard-coded cpuctl path"
Glenn Kasten [Mon, 5 Mar 2012 23:14:33 +0000 (15:14 -0800)]
Use sched_policy to avoid hard-coded cpuctl path
Change-Id: I8f62287d1b60d8eef72d1dfc64be5c3d56e9f498
Robert Greenwalt [Thu, 16 Feb 2012 22:43:03 +0000 (14:43 -0800)]
Use the new command numbering scheme.
Support multiple commands on a single socket via command numbers.
NativeDaemonConnector has been changed, so we need to use it here
too.
bug:
5864209
Change-Id: Ie06e966d50057d122a958377731c0385ea367b69
Nick Kralevich [Thu, 23 Feb 2012 21:20:30 +0000 (13:20 -0800)]
vold: add -Werror=format
Stop format string bugs from creeping into root level processes.
Change-Id: Ifa19ac0cacba76392040ab16cebe557b5b016706
Mike Lockwood [Wed, 15 Feb 2012 21:43:28 +0000 (13:43 -0800)]
Add support for wiping data immediately if crypt fails
Needed for headless devices that need to recover with no user intervention
Bug:
5556856
Change-Id: I0f85591df513a6893324fb057bde114ac1df044b
Signed-off-by: Mike Lockwood <lockwood@google.com>
Mike Lockwood [Wed, 15 Feb 2012 21:43:28 +0000 (13:43 -0800)]
Add support for wiping data immediately if crypt fails
Needed for headless devices that need to recover with no user intervention
Bug:
5556856
Change-Id: Iabe5d68599259b14626bfcf45e6697d81b866101
Signed-off-by: Mike Lockwood <lockwood@google.com>
Ken Sumrall [Thu, 15 Dec 2011 05:24:27 +0000 (21:24 -0800)]
Fix to not return a bogus decryption error when a device is not encrypted.
If there is filesystem damage on a non-encrypted device, and /data is not
mountable, and if the device stores the keys in a file on a different
partition (like on Crespo) then, vold would return an error which caused
the crypto UI to present an option to the user to wipe the device because
it assumed encryption had failed. This fixes it to not do that.
Change-Id: Ibff6299787b45768416dbc4052de7db3b140b808
Ed Heyl [Fri, 28 Oct 2011 19:06:01 +0000 (19:06 +0000)]
keep previous history after reset to mr1 plus aah changes (ics-aah-wip)
Ed Heyl [Wed, 26 Oct 2011 21:53:28 +0000 (21:53 +0000)]
undo reset to ics-mr1 until we have a better method
Ed Heyl [Wed, 26 Oct 2011 18:50:28 +0000 (18:50 +0000)]
reset to ics-mr1, but keep history