David 'Digit' Turner
137858b43b
resolved conflicts for merge of 5284bcff
to gingerbread-plus-aosp
...
Change-Id: I108a0c32efb5add1fec41bfe76f041971801d48d
2011-07-14 07:35:14 +02:00
Jeff Brown
81893259c9
Merge "Remove the simulator target from all makefiles. Bug: 5010576"
2011-07-12 12:17:00 -07:00
Jeff Brown
ea89f53387
Remove the simulator target from all makefiles.
...
Bug: 5010576
Change-Id: I7e531101ae057fb059d7d56c99433c4d66e866dc
2011-07-11 22:12:37 -07:00
Ken Sumrall
6f0b430815
Merge "Prevent sharing or formatting of a vold managed volumes during encryption."
2011-07-11 15:51:09 -07:00
Ken Sumrall
3b17005083
Prevent sharing or formatting of a vold managed volumes during encryption.
...
Mounting was already not allowed, but also unshare before starting
encryption, and don't allow sharing or formatting to be initiated
during encrytion.
Change-Id: Ida188d81f025739ba4dd90492b3e66088735991e
2011-07-11 15:38:57 -07:00
Ken Sumrall
396844d17a
Merge "Fix to display the proper percentage complete during encryption."
2011-07-11 15:37:05 -07:00
Ken Sumrall
128626fc5a
Fix to display the proper percentage complete during encryption.
...
Forgot to include the size of the userdata partition when computing
the total size of vold managed volumes to encrypt.
Change-Id: I237548439d4380b4225ffbc603fa972c3b1c5bae
2011-07-11 15:33:05 -07:00
android-merger
a0272d2c18
reset, and keep history
2011-07-08 12:29:24 -07:00
David 'Digit' Turner
5284bcffed
merge intel x86 patches into gingerbread branch
2011-07-08 18:19:06 +02:00
The Android Open Source Project
5283052272
Reconcile with gingerbread-release
...
Change-Id: I3cb3d915837ebe59c2d7007d71ef3a1f334e9b8b
2011-07-07 15:22:42 -07:00
android-merger
1c55ddb758
Revert "add bounds checking for mPartMinors[]"
...
This reverts commit f3d3ce5e53
.
2011-07-07 14:54:24 -07:00
android-merger
cf7369a458
Revert "vold: Enable the SO_PASSCRED socket option"
...
This reverts commit c51920c824
.
2011-07-07 14:54:01 -07:00
Joseph Lehrer
507d31b86b
vold: retry mounting partition
...
Works around a race condition between the vold and MountService uevent handlers
Change-Id: I71c92f2e9b92e1fefc192da166a91d81bc60e242
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-07-06 13:29:32 -04:00
Mike Lockwood
9322b103a3
am 273d3549
: am 2c9d8de7
: Merge "Prevent buffer overflows."
...
* commit '273d3549198d144331f3e502eeb1215417d72b16':
Prevent buffer overflows.
2011-06-29 06:46:53 -07:00
Mike Lockwood
273d354919
am 2c9d8de7
: Merge "Prevent buffer overflows."
...
* commit '2c9d8de79a0dd7f894c65777a197c86486aff96c':
Prevent buffer overflows.
2011-06-29 06:42:33 -07:00
Mike Lockwood
2c9d8de79a
Merge "Prevent buffer overflows."
2011-06-29 06:30:38 -07:00
Dianne Hackborn
736910ca99
Add new vold call to get the path to an asec fs.
...
Change-Id: Ife15628ed6e2493c9e85a2ade6d59a194fdddde5
2011-06-27 13:37:28 -07:00
Peter Bohm
092aa1c585
Prevent buffer overflows.
...
To eliminate possible buffer overflows some strcpy,
sprintf and strcat have been changed to strlcpy,
snprintf and strlcat.
Change-Id: Ieb9d4b600c894946a6492f8629ff39f2fcc106d3
Signed-off-by: Oskar Andero <oskar.andero@sonyericsson.com>
2011-06-27 10:04:05 +02:00
Mike Lockwood
97f2fc110b
Update path for seting USB mass storage backing store
...
Change-Id: I0e5fab1624e5ef5d2f55e2584d8adc1b6bab91b0
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-06-17 23:57:12 -04:00
Mike Lockwood
6b715592ec
Merge "Remove obsolete code for monitoring USB status"
2011-06-17 20:55:07 -07:00
Ken Sumrall
86bccb14d6
Merge "Don't abort the encryption process if an internal volume is present but unmounted."
2011-06-14 15:30:36 -07:00
Ken Sumrall
319b1043bb
Don't abort the encryption process if an internal volume is present but unmounted.
...
It is not a failure if the SD card is not mounted.
Change-Id: If954f77c55ac124b9b7b39c89ffbafb4e5ea9e98
2011-06-14 14:01:55 -07:00
Nick Kralevich
5864fabc8b
am 598e833d
: am b20d54b2
: Merge "fix double closing file descriptors"
...
* commit '598e833d42a687259bc3c9a5a39ad9ba8b105cbb':
fix double closing file descriptors
2011-06-09 11:27:38 -07:00
Bruce Beare
d11b833201
Avoid array overrun. We can now mount the /sdcard partition on our boot sdcards
...
Orig-Change-Id: I6e9db8c55db49b4aa61dd40cd59495f55e5b3368
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
2011-06-09 17:39:19 +02:00
Nick Kralevich
598e833d42
am b20d54b2
: Merge "fix double closing file descriptors"
...
* commit 'b20d54b2309adee8d192942015740735ded975d3':
fix double closing file descriptors
2011-06-07 16:28:11 -07:00
Nick Kralevich
b20d54b230
Merge "fix double closing file descriptors"
2011-06-07 15:44:51 -07:00
Mike Lockwood
a976656ff9
Remove obsolete code for monitoring USB status
...
Change-Id: I8ac8900b3135f03b7717540b825ff6df76f31c0b
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-06-07 08:34:08 -07:00
Robert CH Chou
06aaa41096
fix double closing file descriptors
...
Change-Id: I243628b77a0b7b138785167ccb5520e1a9374a78
2011-06-06 21:32:45 +08:00
Ken Sumrall
29d8da8cef
vold: allow to store key in a file on another partition
...
Add support for keeping the keys in a separate file on another partition,
for devices with no space reserved for a footer after the userdata filesystem.
Add support for encrypting the volumes managed by vold, if they meet certain
criteria, namely being marked as nonremovable and encryptable in vold.fstab.
A bit of trickiness is required to keep vold happy.
Change-Id: Idf0611f74b56c1026c45742ca82e0c26e58828fe
2011-06-02 16:30:14 -07:00
The Android Open Source Project
10a9e42835
Reconcile with gingerbread-release honeycomb-release
...
Change-Id: I70f4170b78ed5412a4addd3c603c8ff52c8cfa0d
2011-05-20 14:19:46 -07:00
The Android Automerger
93f032122f
merge in gingerbread-release history after reset to gingerbread
2011-05-13 14:27:41 -07:00
The Android Automerger
311e06bc72
am 9496945d
: (-s ours) am 4e00f1fa
: Merge remote branch \'goog/honeycomb-mr2\' into honeycomb-LTE
...
* commit '9496945d0ded76031cb129de65be425cfa971673':
DO NOT MERGE Only create android_secure mountpoint on the primary external storage volume.
DO NOT MERGE Mount secondary external storage writable by AID_MEDIA_RW rather than AID_SDCARD_RW
2011-05-09 10:53:17 -07:00
The Android Automerger
9496945d0d
am 4e00f1fa
: Merge remote branch \'goog/honeycomb-mr2\' into honeycomb-LTE
...
* commit '4e00f1fa4d4e82bba4afe1c2a21bf0a56b3a4c8f':
DO NOT MERGE Only create android_secure mountpoint on the primary external storage volume.
DO NOT MERGE Mount secondary external storage writable by AID_MEDIA_RW rather than AID_SDCARD_RW
2011-05-09 10:40:33 -07:00
The Android Automerger
4e00f1fa4d
Merge remote branch 'goog/honeycomb-mr2' into honeycomb-LTE
2011-05-08 22:45:47 -07:00
Mike Lockwood
31ab84f6a9
am c13e0967
: (-s ours) am 745ddcb2
: DO NOT MERGE Only create android_secure mountpoint on the primary external storage volume.
...
* commit 'c13e0967debb6b5a817004e9184e6d3466c42813':
DO NOT MERGE Only create android_secure mountpoint on the primary external storage volume.
2011-05-04 12:45:42 -07:00
Mike Lockwood
71bde5e706
am 7877388b
: (-s ours) am f4cd1c6b
: DO NOT MERGE Mount secondary external storage writable by AID_MEDIA_RW rather than AID_SDCARD_RW
...
* commit '7877388b6c65c4819e436141ccc519161b719bec':
DO NOT MERGE Mount secondary external storage writable by AID_MEDIA_RW rather than AID_SDCARD_RW
2011-05-04 12:45:40 -07:00
Mike Lockwood
c13e0967de
am 745ddcb2
: DO NOT MERGE Only create android_secure mountpoint on the primary external storage volume.
...
* commit '745ddcb2a6247817dde0790be4c74a81e7b324d4':
DO NOT MERGE Only create android_secure mountpoint on the primary external storage volume.
2011-05-04 08:53:26 -07:00
Mike Lockwood
7877388b6c
am f4cd1c6b
: DO NOT MERGE Mount secondary external storage writable by AID_MEDIA_RW rather than AID_SDCARD_RW
...
* commit 'f4cd1c6b1912d2481334152f7dec50067960a90c':
DO NOT MERGE Mount secondary external storage writable by AID_MEDIA_RW rather than AID_SDCARD_RW
2011-05-04 08:53:25 -07:00
Mike Lockwood
745ddcb2a6
DO NOT MERGE Only create android_secure mountpoint on the primary external storage volume.
...
Change-Id: If2532ce8ca7d584f2442d830450313198234bd23
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-04 09:42:26 -04:00
Mike Lockwood
f4cd1c6b19
DO NOT MERGE Mount secondary external storage writable by AID_MEDIA_RW rather than AID_SDCARD_RW
...
Change-Id: Id9a6fa6705cf97b94d419e85b5d74413e79fc748
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-04 09:42:23 -04:00
Mike Lockwood
3bcc2410f5
DO NOT MERGE Only create android_secure mountpoint on the primary external storage volume.
...
Change-Id: If21d134e7d8333b8214603a2d43a3153ab8760cc
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-03 20:49:16 -04:00
Mike Lockwood
11a3922ec6
DO NOT MERGE Mount secondary external storage writable by AID_MEDIA_RW rather than AID_SDCARD_RW
...
Change-Id: Id65f76eacaec1787aa557f96447c5bc19b7b127f
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-03 20:49:13 -04:00
Nick Kralevich
cc8e96c8dc
DirectVolume: don't continue on invalid PARTN value
...
Change-Id: I1e434c5b47b40fabaf1e702d7f2e43a88c0497dc
2011-04-29 16:07:45 -07:00
Conley Owens
8bd9b3fcc6
am 3368f167
: am 9cb6e501
: Ignore change "Set SO_PASSCRED on the uevent socket." in favor of change in internal tree.
...
* commit '3368f167578fcd2ef024e6d8da723f349089fa7c':
Set SO_PASSCRED on the uevent socket. (needed for change I393c21da)
2011-04-26 16:08:13 -07:00
Conley Owens
3368f16757
am 9cb6e501
: Ignore change "Set SO_PASSCRED on the uevent socket." in favor of change in internal tree.
...
* commit '9cb6e501f17ec2a511d942c833ea51a53bcd7249':
Set SO_PASSCRED on the uevent socket. (needed for change I393c21da)
2011-04-26 16:05:29 -07:00
Conley Owens
9cb6e501f1
Ignore change "Set SO_PASSCRED on the uevent socket." in favor of change
...
in internal tree.
Change-Id: Ibdf7cf1e1d0ba177d9de813baa6481ddd31d5d9c
2011-04-26 15:59:01 -07:00
Conley Owens
c840b382c5
Merge "Set SO_PASSCRED on the uevent socket. (needed for change I393c21da)"
2011-04-26 15:36:04 -07:00
Vernon Tang
5f6ae96bab
Set SO_PASSCRED on the uevent socket. (needed for change I393c21da)
...
Change-Id: I09a8a6d7c654869a40339adce181e6b981f10369
2011-04-25 13:41:20 +10:00
Nick Kralevich
cf5af17119
am b510cd4e
: am 77992e71
: vold: Enable the SO_PASSCRED socket option
...
* commit 'b510cd4e8a480cbb01ff3175f2e99b11328ff88a':
vold: Enable the SO_PASSCRED socket option
2011-04-19 15:44:57 -07:00
Nick Kralevich
b510cd4e8a
am 77992e71
: vold: Enable the SO_PASSCRED socket option
...
* commit '77992e713ceac377ed226b555685f99fcfeb2c14':
vold: Enable the SO_PASSCRED socket option
2011-04-19 15:36:16 -07:00