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
12 years ago
59810a03ef
am 3aeec65f: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '3aeec65f6398183ea8dd086f4d33cbc32cbce8c7':
Update environment variable for multi-user.
12 years ago
3aeec65f63
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I4024b1fab0705f6b943ef6b0633ad9e29beacb73
12 years ago
13f393d699
Update environment variable for multi-user.
...
Bug: 7260040
Change-Id: I96d821e11a3f0be32bfe92a4151f00f2b15d100e
12 years ago
b080ca5a23
am 700b8cf8: am b77bc469: Update environment variable for multi-user.
...
* commit '700b8cf87ee70fa5cba9ee09669aad07f983055a':
Update environment variable for multi-user.
12 years ago
700b8cf87e
am b77bc469: Update environment variable for multi-user.
...
* commit 'b77bc4696b19d9b1ef82810f8d5f671c963d1dc1':
Update environment variable for multi-user.
12 years ago
b77bc4696b
Update environment variable for multi-user.
...
Bug: 7260040
Change-Id: I96d821e11a3f0be32bfe92a4151f00f2b15d100e
12 years ago
bbece7ac3a
am aba1f4d5: am e919efea: Workaround a kernel race when loading dmcrypt table
...
* commit 'aba1f4d5593f153eac63e983d56ac36f03663a3d':
Workaround a kernel race when loading dmcrypt table
12 years ago
aba1f4d559
am e919efea: Workaround a kernel race when loading dmcrypt table
...
* commit 'e919efea94b178ed214ed2e78ef0d008727d62ab':
Workaround a kernel race when loading dmcrypt table
12 years ago
9f910d81ae
merge in jb-mr1-release history after reset to jb-mr1-dev
12 years ago
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
12 years ago
e48e95bdfd
am 4e9fb840: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '4e9fb84063a2ad84df45ade41d301ec3aaf06160':
12 years ago
4e9fb84063
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I1071ef79a7f5080b822cc4032647ea1feacd5d12
12 years ago
2bbf02c9b0
merge in jb-mr1-release history after reset to jb-mr1-dev
12 years ago
d5de3602d7
am 9f413b77: am 6947904a: Handle multi-user mountObb() requests.
...
* commit '9f413b77b05998b2dfe831d8752ba952f524b9ba':
Handle multi-user mountObb() requests.
12 years ago
9f413b77b0
am 6947904a: Handle multi-user mountObb() requests.
...
* commit '6947904a76b69a1db20a3ddd30c0bcd281922fde':
Handle multi-user mountObb() requests.
12 years ago
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
12 years ago
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
12 years ago
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
12 years ago
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
12 years ago
2d1e5e9680
Merge "Extend the maximum number of partitions from 4 to 32"
12 years ago
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
12 years ago
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
12 years ago
952e688852
am cd7ab371: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'cd7ab371fc070206a030d298d896061458704abd':
Unmount external storage on multi-user devices.
12 years ago
cd7ab371fc
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I91572ae0a96d0f7450b8afff1b32167c8dd0c086
12 years ago
e270d6c1b5
Unmount external storage on multi-user devices.
...
Bug: 7044670
Change-Id: If1f99968b0392cae9420d067c75bfc18d1067b2c
12 years ago
da9eed1c80
am 7382f81f: Unmount external storage on multi-user devices.
...
* commit '7382f81fba895f1ac970ac2fad875f35836b8082':
Unmount external storage on multi-user devices.
12 years ago
7382f81fba
Unmount external storage on multi-user devices.
...
Bug: 7044670
Change-Id: If1f99968b0392cae9420d067c75bfc18d1067b2c
12 years ago
225590c05a
am f763b2fc: (-s ours) am 7c5109be: (-s ours) Reconcile with jb-mr0-release - do not merge
...
* commit 'f763b2fc07ee79045ca6c47e54d09dec90694e6c':
12 years ago
f763b2fc07
am 7c5109be: (-s ours) Reconcile with jb-mr0-release - do not merge
...
* commit '7c5109bef8c1f8b857b043bf9c1d26c2f0556e8f':
12 years ago
7c5109bef8
Reconcile with jb-mr0-release - do not merge
...
Change-Id: I3ec7be5d1d08566f120f18b68d2f691f92f006c8
12 years ago
a20b197260
merge in jb-mr0-release history after reset to jb-dev
12 years ago
118343187a
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
12 years ago
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
12 years ago
62224a32f0
am eacf7e03: Only cleanup ASECs in external storage DO NOT MERGE
...
* commit 'eacf7e03d60a2b33ac6cdaa0e01bd6a6fdd9455a':
Only cleanup ASECs in external storage DO NOT MERGE
12 years ago
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
12 years ago
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
12 years ago
912d0b0755
Merge "Fix a typo in cryptfs.c"
12 years ago
319369ac11
Fix a typo in cryptfs.c
...
Change-Id: If629fa996b135e432bc89da7518b0c1f02750b45
12 years ago
4684e58a8d
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
12 years ago
b405f36760
am 9ee8a315: Reconcile with jb-release
...
* commit '9ee8a315eefde7e6ad1bc07bc9d50528f548e8e8':
Unmount all asec apps before encrypting
12 years ago
9ee8a315ee
Reconcile with jb-release
...
Change-Id: I60294fb5c41ef34eccc322889168497d9449c6ea
12 years ago
51d1ae176e
am a7926050: am 425524db: Unmount all asec apps before encrypting
...
* commit 'a79260500a869f867118a6e5289c6e5a0353558f':
Unmount all asec apps before encrypting
12 years ago
a79260500a
am 425524db: Unmount all asec apps before encrypting
...
* commit '425524dba1552ab3d2ad39e205e65d0a2af997f2':
Unmount all asec apps before encrypting
12 years ago
4053aaef6f
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
12 years ago
425524dba1
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
12 years ago
fc676b69bd
am e925ff66: am bac5eb96: Merge "Delay disk inserted broadcast until disk is ready"
...
* commit 'e925ff6670bb9cef9118ddceb2e3bff81833bd09':
Delay disk inserted broadcast until disk is ready
12 years ago
e925ff6670
am bac5eb96: Merge "Delay disk inserted broadcast until disk is ready"
...
* commit 'bac5eb966c5c3aa9abe83cdb5187326f422741ab':
Delay disk inserted broadcast until disk is ready
12 years ago
bac5eb966c
Merge "Delay disk inserted broadcast until disk is ready"
12 years ago
ac3d1eac00
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
12 years ago
Jeff Sharkey
The Android Open Source Project
Ken Sumrall
The Android Automerger
Elliott Hughes
rpcraig
Hirofumi Ando
Kenny Root
Nick Kralevich
Jean-Baptiste Queru