Commit graph

408 commits

Author SHA1 Message Date
The Android Open Source Project
10b8e684e1 Reconcile with jb-mr1-release - do not merge
Change-Id: Ic3c4a57147bc3a4154c140beeeed27b5e3be9ece
2012-10-31 09:19:05 -07:00
Elliott Hughes
bb7afa4989 am 29e55ef8: am edf4e179: Merge "Fix vold\'s use of readdir_r(3)."
* commit '29e55ef83def8eaf6aa01201c6344a8037b2f780':
  Fix vold's use of readdir_r(3).
2012-10-30 10:11:34 -07:00
Elliott Hughes
29e55ef83d am edf4e179: Merge "Fix vold\'s use of readdir_r(3)."
* commit 'edf4e17940c6d3887e9009b23ffca5be8116fbe9':
  Fix vold's use of readdir_r(3).
2012-10-29 17:15:00 -07:00
Elliott Hughes
edf4e17940 Merge "Fix vold's use of readdir_r(3)." 2012-10-26 17:25:46 -07:00
Elliott Hughes
8c480f73ee Fix vold's use of readdir_r(3).
Change-Id: I805a1799755429dd1f6f3bdc2e6a02f483587b35
2012-10-26 16:57:19 -07:00
Nick Kralevich
2da54373ed am 2e0d70f9: am 678d556f: Merge "Add snprintf truncation and output error checks."
* commit '2e0d70f98d10089f0cc3b88848d203cb4694fb98':
  Add snprintf truncation and output error checks.
2012-10-19 11:12:44 -07:00
Nick Kralevich
2e0d70f98d am 678d556f: Merge "Add snprintf truncation and output error checks."
* commit '678d556f439cae504c343c15d77e9ec020a9385c':
  Add snprintf truncation and output error checks.
2012-10-19 11:09:59 -07:00
Nick Kralevich
678d556f43 Merge "Add snprintf truncation and output error checks." 2012-10-19 10:49:24 -07:00
rpcraig
d1c226fce3 Add snprintf truncation and output error checks.
Change-Id: If7fc9bba4b6cd4b01d2c19e967105ffc57169e97
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
2012-10-19 05:56:00 -04:00
The Android Automerger
1cbe0ce40c merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-18 07:00:15 -07:00
Ken Sumrall
e959ac9b99 am 05753f53: am 92736efa: Another fix for encryption
* commit '05753f5380e4bc678ae9bf11b8b6adb6c56f33bf':
  Another fix for encryption
2012-10-17 21:24:13 -07:00
Ken Sumrall
05753f5380 am 92736efa: Another fix for encryption
* commit '92736efab068bdbfeb1177544907b84511fb04e0':
  Another fix for encryption
2012-10-17 21:21:11 -07:00
Ken Sumrall
92736efab0 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
2012-10-17 20:57:14 -07:00
Kenny Root
88d275c683 am bb67b67c: am fd5b29be: Merge "Extend vold support for creating ext4 images."
* commit 'bb67b67cc760e4eab8a144d1ce1df9ad2dcdc8c2':
  Extend vold support for creating ext4 images.
2012-10-17 13:01:59 -07:00
Kenny Root
bb67b67cc7 am fd5b29be: Merge "Extend vold support for creating ext4 images."
* commit 'fd5b29be8c572058ed9ab0198f5603e96c585d3c':
  Extend vold support for creating ext4 images.
2012-10-17 12:58:57 -07:00
Kenny Root
fd5b29be8c Merge "Extend vold support for creating ext4 images." 2012-10-17 11:53:41 -07:00
The Android Open Source Project
5806aedff0 am 4fdf09c3: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '4fdf09c3103074770675b40c9fb5e47c04617c61':
  Fix encryption on certain devices
2012-10-10 09:48:04 -07:00
The Android Open Source Project
4fdf09c310 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: Ifffd0bab9123c37df7c9abdbf166e32ca9850835
2012-10-10 09:46:07 -07:00
Ken Sumrall
f1a6123f9a 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
2012-10-09 16:20:51 -07:00
Ken Sumrall
1f5205e5d2 am 06dbc228: am 9dedfd47: Fix encryption on certain devices
* commit '06dbc22839ff8e411405f6b9c0635cdd0fd8b4d5':
  Fix encryption on certain devices
2012-10-09 15:12:57 -07:00
Ken Sumrall
06dbc22839 am 9dedfd47: Fix encryption on certain devices
* commit '9dedfd473dc59e0277004e5b917e4eced02c8af5':
  Fix encryption on certain devices
2012-10-09 15:11:18 -07:00
Ken Sumrall
9dedfd473d 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
2012-10-09 14:30:00 -07:00
The Android Open Source Project
14a26131c7 am f1e72279: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'f1e72279ffbff47ef404e8f7d8c9bd7306f8382d':
2012-10-09 07:35:36 -07:00
The Android Open Source Project
f1e72279ff Reconcile with jb-mr1-release - do not merge
Change-Id: Iac520484dec44e5f54fe0aca54010520aa8fd7e2
2012-10-09 07:31:11 -07:00
The Android Automerger
2a012c02b4 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-07 07:00:08 -07:00
Jeff Sharkey
4bbe7f69f4 am 762f7268: am 7a3c3d46: Unmount in-place instead of using MS_MOVE.
* commit '762f7268255f13e1c875977ce5429ced8bfaead7':
  Unmount in-place instead of using MS_MOVE.
2012-10-05 15:32:27 -07:00
Jeff Sharkey
762f726825 am 7a3c3d46: Unmount in-place instead of using MS_MOVE.
* commit '7a3c3d462ebd58bda0ceaba9c00c385d44c13d08':
  Unmount in-place instead of using MS_MOVE.
2012-10-05 15:30:28 -07:00
Jeff Sharkey
7a3c3d462e 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
2012-10-04 16:50:17 -07:00
The Android Open Source Project
59810a03ef am 3aeec65f: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '3aeec65f6398183ea8dd086f4d33cbc32cbce8c7':
  Update environment variable for multi-user.
2012-10-02 09:24:42 -07:00
The Android Open Source Project
3aeec65f63 Reconcile with jb-mr1-release - do not merge
Change-Id: I4024b1fab0705f6b943ef6b0633ad9e29beacb73
2012-10-02 09:21:07 -07:00
Jeff Sharkey
13f393d699 Update environment variable for multi-user.
Bug: 7260040
Change-Id: I96d821e11a3f0be32bfe92a4151f00f2b15d100e
2012-10-01 16:23:36 -07:00
Jeff Sharkey
b080ca5a23 am 700b8cf8: am b77bc469: Update environment variable for multi-user.
* commit '700b8cf87ee70fa5cba9ee09669aad07f983055a':
  Update environment variable for multi-user.
2012-10-01 14:46:31 -07:00
Jeff Sharkey
700b8cf87e am b77bc469: Update environment variable for multi-user.
* commit 'b77bc4696b19d9b1ef82810f8d5f671c963d1dc1':
  Update environment variable for multi-user.
2012-10-01 14:44:28 -07:00
Jeff Sharkey
b77bc4696b Update environment variable for multi-user.
Bug: 7260040
Change-Id: I96d821e11a3f0be32bfe92a4151f00f2b15d100e
2012-10-01 14:36:26 -07:00
Ken Sumrall
bbece7ac3a am aba1f4d5: am e919efea: Workaround a kernel race when loading dmcrypt table
* commit 'aba1f4d5593f153eac63e983d56ac36f03663a3d':
  Workaround a kernel race when loading dmcrypt table
2012-10-01 13:45:18 -07:00
Ken Sumrall
aba1f4d559 am e919efea: Workaround a kernel race when loading dmcrypt table
* commit 'e919efea94b178ed214ed2e78ef0d008727d62ab':
  Workaround a kernel race when loading dmcrypt table
2012-10-01 10:14:58 -07:00
The Android Automerger
9f910d81ae merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-30 18:18:02 -07:00
Ken Sumrall
e919efea94 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
2012-09-29 17:24:46 -07:00
The Android Open Source Project
e48e95bdfd am 4e9fb840: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '4e9fb84063a2ad84df45ade41d301ec3aaf06160':
2012-09-26 10:07:39 -07:00
The Android Open Source Project
4e9fb84063 Reconcile with jb-mr1-release - do not merge
Change-Id: I1071ef79a7f5080b822cc4032647ea1feacd5d12
2012-09-26 09:09:05 -07:00
The Android Automerger
2bbf02c9b0 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-26 07:00:30 -07:00
Jeff Sharkey
d5de3602d7 am 9f413b77: am 6947904a: Handle multi-user mountObb() requests.
* commit '9f413b77b05998b2dfe831d8752ba952f524b9ba':
  Handle multi-user mountObb() requests.
2012-09-25 17:55:57 -07:00
Jeff Sharkey
9f413b77b0 am 6947904a: Handle multi-user mountObb() requests.
* commit '6947904a76b69a1db20a3ddd30c0bcd281922fde':
  Handle multi-user mountObb() requests.
2012-09-25 17:54:22 -07:00
Jeff Sharkey
6947904a76 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
2012-09-25 16:14:57 -07:00
Elliott Hughes
e0906ce9dc 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
2012-09-25 12:33:32 -07:00
Elliott Hughes
5695b4bb1c 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
2012-09-25 12:30:15 -07:00
Elliott Hughes
f7e7ee969d 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
2012-09-25 12:26:08 -07:00
Elliott Hughes
2d1e5e9680 Merge "Extend the maximum number of partitions from 4 to 32" 2012-09-25 10:19:43 -07:00
rpcraig
a54e13a3dc 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
2012-09-21 15:44:55 -04:00
Hirofumi Ando
b4a8c9cd90 Extend the maximum number of partitions from 4 to 32
Some platforms needs more than 4 partitions, e.g. the lt26.

Change-Id: Id22125313824b0ae15a4596709f52c4ab609a542
2012-09-20 12:00:33 +02:00