d67870ee8c
am 16a32502: am 3fd60b42: Fix issue #7503920 : Log spew from vold
...
* commit '16a32502bf98b4b0fc15a82a36242fada29baf5b':
Fix issue #7503920 : Log spew from vold
12 years ago
16a32502bf
am 3fd60b42: Fix issue #7503920 : Log spew from vold
...
* commit '3fd60b428202a0f5f324fccc67c0c0402b9131ba':
Fix issue #7503920 : Log spew from vold
12 years ago
3fd60b4282
Fix issue #7503920 : Log spew from vold
...
Change-Id: Ibfa5b979014f433085b94aab0d3d81bf9269d4b5
12 years ago
9ffb1ac318
am b1596afa: (-s ours) am b7afc4e1: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
* commit 'b1596afa59c7108cc6ce23bab54a1bc41961806a':
12 years ago
b1596afa59
am b7afc4e1: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
* commit 'b7afc4e15b29d933477328d1944c3201337808c6':
12 years ago
b7afc4e15b
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
Change-Id: I8de173f6b24b2f82b20e568e577878d8539e5148
12 years ago
cda1948e61
am 10b8e684: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '10b8e684e1945edfb60ec4391ac4c7f3d8bf4172':
12 years ago
10b8e684e1
Reconcile with jb-mr1-release - do not merge
...
Change-Id: Ic3c4a57147bc3a4154c140beeeed27b5e3be9ece
12 years ago
bb7afa4989
am 29e55ef8: am edf4e179: Merge "Fix vold\'s use of readdir_r(3)."
...
* commit '29e55ef83def8eaf6aa01201c6344a8037b2f780':
Fix vold's use of readdir_r(3).
12 years ago
29e55ef83d
am edf4e179: Merge "Fix vold\'s use of readdir_r(3)."
...
* commit 'edf4e17940c6d3887e9009b23ffca5be8116fbe9':
Fix vold's use of readdir_r(3).
12 years ago
edf4e17940
Merge "Fix vold's use of readdir_r(3)."
12 years ago
8c480f73ee
Fix vold's use of readdir_r(3).
...
Change-Id: I805a1799755429dd1f6f3bdc2e6a02f483587b35
12 years ago
2da54373ed
am 2e0d70f9: am 678d556f: Merge "Add snprintf truncation and output error checks."
...
* commit '2e0d70f98d10089f0cc3b88848d203cb4694fb98':
Add snprintf truncation and output error checks.
12 years ago
2e0d70f98d
am 678d556f: Merge "Add snprintf truncation and output error checks."
...
* commit '678d556f439cae504c343c15d77e9ec020a9385c':
Add snprintf truncation and output error checks.
12 years ago
678d556f43
Merge "Add snprintf truncation and output error checks."
12 years ago
d1c226fce3
Add snprintf truncation and output error checks.
...
Change-Id: If7fc9bba4b6cd4b01d2c19e967105ffc57169e97
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
12 years ago
1cbe0ce40c
merge in jb-mr1-release history after reset to jb-mr1-dev
12 years ago
e959ac9b99
am 05753f53: am 92736efa: Another fix for encryption
...
* commit '05753f5380e4bc678ae9bf11b8b6adb6c56f33bf':
Another fix for encryption
12 years ago
05753f5380
am 92736efa: Another fix for encryption
...
* commit '92736efab068bdbfeb1177544907b84511fb04e0':
Another fix for encryption
12 years ago
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
12 years ago
88d275c683
am bb67b67c: am fd5b29be: Merge "Extend vold support for creating ext4 images."
...
* commit 'bb67b67cc760e4eab8a144d1ce1df9ad2dcdc8c2':
Extend vold support for creating ext4 images.
12 years ago
bb67b67cc7
am fd5b29be: Merge "Extend vold support for creating ext4 images."
...
* commit 'fd5b29be8c572058ed9ab0198f5603e96c585d3c':
Extend vold support for creating ext4 images.
12 years ago
fd5b29be8c
Merge "Extend vold support for creating ext4 images."
12 years ago
5806aedff0
am 4fdf09c3: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
* commit '4fdf09c3103074770675b40c9fb5e47c04617c61':
Fix encryption on certain devices
12 years ago
4fdf09c310
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
Change-Id: Ifffd0bab9123c37df7c9abdbf166e32ca9850835
12 years ago
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
12 years ago
1f5205e5d2
am 06dbc228: am 9dedfd47: Fix encryption on certain devices
...
* commit '06dbc22839ff8e411405f6b9c0635cdd0fd8b4d5':
Fix encryption on certain devices
12 years ago
06dbc22839
am 9dedfd47: Fix encryption on certain devices
...
* commit '9dedfd473dc59e0277004e5b917e4eced02c8af5':
Fix encryption on certain devices
12 years ago
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
12 years ago
14a26131c7
am f1e72279: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'f1e72279ffbff47ef404e8f7d8c9bd7306f8382d':
12 years ago
f1e72279ff
Reconcile with jb-mr1-release - do not merge
...
Change-Id: Iac520484dec44e5f54fe0aca54010520aa8fd7e2
12 years ago
2a012c02b4
merge in jb-mr1-release history after reset to jb-mr1-dev
12 years ago
4bbe7f69f4
am 762f7268: am 7a3c3d46: Unmount in-place instead of using MS_MOVE.
...
* commit '762f7268255f13e1c875977ce5429ced8bfaead7':
Unmount in-place instead of using MS_MOVE.
12 years ago
762f726825
am 7a3c3d46: Unmount in-place instead of using MS_MOVE.
...
* commit '7a3c3d462ebd58bda0ceaba9c00c385d44c13d08':
Unmount in-place instead of using MS_MOVE.
12 years ago
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
Dianne Hackborn
The Android Open Source Project
Elliott Hughes
Nick Kralevich
rpcraig
The Android Automerger
Ken Sumrall
Kenny Root
Jeff Sharkey