Commit graph

343 commits

Author SHA1 Message Date
Chih-Wei Huang
7929deb206 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
2013-02-10 23:34:36 +08:00
The Android Open Source Project
b1596afa59 am b7afc4e1: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit 'b7afc4e15b29d933477328d1944c3201337808c6':
2012-11-06 12:27:10 -08:00
The Android Open Source Project
b7afc4e15b Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I8de173f6b24b2f82b20e568e577878d8539e5148
2012-11-06 12:19:27 -08:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
The Android Open Source Project
cd7ab371fc Reconcile with jb-mr1-release - do not merge
Change-Id: I91572ae0a96d0f7450b8afff1b32167c8dd0c086
2012-08-25 07:18:23 -07:00
Jeff Sharkey
e270d6c1b5 Unmount external storage on multi-user devices.
Bug: 7044670
Change-Id: If1f99968b0392cae9420d067c75bfc18d1067b2c
2012-08-23 14:22:27 -07:00
Jeff Sharkey
7382f81fba Unmount external storage on multi-user devices.
Bug: 7044670
Change-Id: If1f99968b0392cae9420d067c75bfc18d1067b2c
2012-08-23 14:09:14 -07:00
The Android Open Source Project
f763b2fc07 am 7c5109be: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '7c5109bef8c1f8b857b043bf9c1d26c2f0556e8f':
2012-08-16 18:59:13 -07:00
The Android Open Source Project
7c5109bef8 Reconcile with jb-mr0-release - do not merge
Change-Id: I3ec7be5d1d08566f120f18b68d2f691f92f006c8
2012-08-16 18:57:10 -07:00
The Android Automerger
a20b197260 merge in jb-mr0-release history after reset to jb-dev 2012-08-16 17:57:55 -07:00
Kenny Root
4fe053e1b4 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
2012-08-13 11:45:38 -07:00
Kenny Root
62224a32f0 am eacf7e03: Only cleanup ASECs in external storage DO NOT MERGE
* commit 'eacf7e03d60a2b33ac6cdaa0e01bd6a6fdd9455a':
  Only cleanup ASECs in external storage DO NOT MERGE
2012-08-13 11:42:56 -07:00
Kenny Root
eacf7e03d6 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 93ecb38dad)

Bug: 6948035
Change-Id: Ib60727bd360caa32173797ff5b4e1e21fcf20054
2012-08-13 09:49:55 -07:00
Kenny Root
93ecb38dad 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
2012-08-09 15:50:58 -07:00
Ken Sumrall
912d0b0755 Merge "Fix a typo in cryptfs.c" 2012-06-28 17:58:50 -07:00