OSDN Git Service
Nick Kralevich [Tue, 28 Jan 2014 03:14:34 +0000 (19:14 -0800)]
am
0de7c611: Validate asec names.
* commit '
0de7c61102611ccd5df1ca48cb733bf037512c6b':
Validate asec names.
Nick Kralevich [Mon, 27 Jan 2014 22:58:06 +0000 (14:58 -0800)]
Validate asec names.
Make sure asec names only contain alphanumeric, underscores,
dots, or dashes. Don't allow double dots.
Bug:
12504045
(cherry picked from commit
669626096513cf741646cf18a9e8ba246d359596)
Change-Id: Ia9d04f373aa95878b2e81584c4167dc2d4aa0c78
The Android Open Source Project [Fri, 17 Aug 2012 01:57:10 +0000 (18:57 -0700)]
Reconcile with jb-mr0-release - do not merge
Change-Id: I3ec7be5d1d08566f120f18b68d2f691f92f006c8
The Android Automerger [Fri, 17 Aug 2012 00:57:55 +0000 (17:57 -0700)]
merge in jb-mr0-release history after reset to jb-dev
Kenny Root [Mon, 13 Aug 2012 18:42:56 +0000 (11:42 -0700)]
am
eacf7e03: Only cleanup ASECs in external storage DO NOT MERGE
* commit '
eacf7e03d60a2b33ac6cdaa0e01bd6a6fdd9455a':
Only cleanup ASECs in external storage DO NOT MERGE
Kenny Root [Thu, 9 Aug 2012 18:28:37 +0000 (11:28 -0700)]
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
93ecb38daded7583a4a61f4f22519bb7a8a8c154)
Bug:
6948035
Change-Id: Ib60727bd360caa32173797ff5b4e1e21fcf20054
The Android Open Source Project [Tue, 19 Jun 2012 13:13:59 +0000 (06:13 -0700)]
Reconcile with jb-release
Change-Id: I60294fb5c41ef34eccc322889168497d9449c6ea
Ken Sumrall [Mon, 18 Jun 2012 17:32:48 +0000 (10:32 -0700)]
am
425524db: Unmount all asec apps before encrypting
* commit '
425524dba1552ab3d2ad39e205e65d0a2af997f2':
Unmount all asec apps before encrypting
Ken Sumrall [Fri, 15 Jun 2012 03:55:28 +0000 (20:55 -0700)]
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
Ken Sumrall [Fri, 15 Jun 2012 03:55:28 +0000 (20:55 -0700)]
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
Jean-Baptiste Queru [Tue, 22 May 2012 14:44:54 +0000 (07:44 -0700)]
am
bac5eb96: Merge "Delay disk inserted broadcast until disk is ready"
* commit '
bac5eb966c5c3aa9abe83cdb5187326f422741ab':
Delay disk inserted broadcast until disk is ready
Jean-Baptiste Queru [Tue, 22 May 2012 14:25:51 +0000 (07:25 -0700)]
Merge "Delay disk inserted broadcast until disk is ready"
The Android Open Source Project [Wed, 16 May 2012 15:41:18 +0000 (08:41 -0700)]
Reconcile with jb-release nakasi-factoryrom-release
Change-Id: I2bc2763dc285edb9aa8bd9bedd068ee4483a3ce5
The Android Automerger [Mon, 14 May 2012 14:06:23 +0000 (07:06 -0700)]
merge in jb-release history after reset to jb-dev
Kenny Root [Fri, 11 May 2012 06:32:27 +0000 (23:32 -0700)]
am
41836711: Merge "Sleep to wait for dm to create node" into jb-dev
* commit '
418367112c96f6ce45aa142d613a575046b7f65f':
Sleep to wait for dm to create node
Kenny Root [Fri, 11 May 2012 06:30:35 +0000 (23:30 -0700)]
Merge "Sleep to wait for dm to create node" into jb-dev
Kenny Root [Thu, 10 May 2012 23:45:29 +0000 (16:45 -0700)]
Native library loading needs to read directory
When calling System.loadLibrary(), it needs to be able to read the
directory to load the file. We could probably fix that, but changing
permissions here is faster.
Bug:
6478606
Change-Id: I296b0805839da5a19950157f9a16755a4d258ca8
Kenny Root [Thu, 10 May 2012 22:39:53 +0000 (15:39 -0700)]
Only set permissions on dirs or files
Traversal would mark directories with the correct permissions, but
they're visited again in post-order which is a different fts_info flag.
Then it would set that to regular file permissions.
Explicitly check to make sure we're looking at a file instead.
Bug:
6478606
Change-Id: I13cab3e69f451da6a994fa974d575ef366f82025
Kenny Root [Thu, 3 May 2012 20:49:46 +0000 (13:49 -0700)]
Sleep to wait for dm to create node
There appears to be a race condition from when the device mapper is
asked to create a device and when it actually appears. When we moved
ASECs to use Ext4, mount started winning the race more often.
Just insert a sleep-retry loop here to counter-act this race. We should
ideally look at the uevent replies, but it takes a bit more effort to
separate them out.
Change-Id: Ie8a5b36b1c9a26f2320a178d37312059d03a1281
Kenny Root [Thu, 10 May 2012 23:56:35 +0000 (16:56 -0700)]
am
1a673c86: Native library loading needs to read directory
* commit '
1a673c868c2d2d81fcaeab34b4a7c75d4a978584':
Native library loading needs to read directory
Kenny Root [Thu, 10 May 2012 23:45:29 +0000 (16:45 -0700)]
Native library loading needs to read directory
When calling System.loadLibrary(), it needs to be able to read the
directory to load the file. We could probably fix that, but changing
permissions here is faster.
Bug:
6478606
Change-Id: I296b0805839da5a19950157f9a16755a4d258ca8
Kenny Root [Thu, 10 May 2012 23:46:37 +0000 (16:46 -0700)]
am
348c8aba: Only set permissions on dirs or files
* commit '
348c8aba0d2df2996e0fe57900ef518c6aeb4b29':
Only set permissions on dirs or files
Kenny Root [Thu, 10 May 2012 22:39:53 +0000 (15:39 -0700)]
Only set permissions on dirs or files
Traversal would mark directories with the correct permissions, but
they're visited again in post-order which is a different fts_info flag.
Then it would set that to regular file permissions.
Explicitly check to make sure we're looking at a file instead.
Bug:
6478606
Change-Id: I13cab3e69f451da6a994fa974d575ef366f82025
Jean-Baptiste Queru [Tue, 8 May 2012 20:39:20 +0000 (13:39 -0700)]
am
5cf6325c: Merge "Unshare ums when SD card is removed"
* commit '
5cf6325c91792dbb1bb08fa1958c1fc8a5b9c45d':
Unshare ums when SD card is removed
Jean-Baptiste Queru [Tue, 8 May 2012 16:55:55 +0000 (09:55 -0700)]
Merge "Unshare ums when SD card is removed"
Magnus Malmborn [Wed, 19 Jan 2011 11:26:52 +0000 (12:26 +0100)]
Delay disk inserted broadcast until disk is ready
Delay sending of "VolumeDiskInserted" broadcast until the disk is
ready (ie until all the partitions have been received from
kernel). This solves a race with MountService, otherwise there is a
risk that MountService tries to mount the SD-card before the
partition(s) have been received and the card will fail to mount.
Change-Id: Ie2a28227ae9a7d6fe9106fb6875f469a0e899014
Lars Svensson [Thu, 7 Apr 2011 13:17:43 +0000 (15:17 +0200)]
Unshare ums when SD card is removed
If SD card is removed without unmounting when in USB mass storage mode
the ums share is not properly closed and the device files 179:0 and 179:1
are left in use. This causes erratic behaviour on subsequent operations on
the card, i.e. mounting and formatting will fail.
Change-Id: I757703c6282f4b76e2d8b027f4644920737309b6
The Android Automerger [Wed, 2 May 2012 14:14:05 +0000 (07:14 -0700)]
merge in jb-release history after reset to jb-dev
Ken Sumrall [Mon, 2 Apr 2012 06:58:44 +0000 (23:58 -0700)]
Changes to encryption to work with the new filesystem manager
The new filesystem manager is in charge of mounting the block devices now,
removing much of the knowledge from init.<device>.rc. This also let us
clean up some init code dealing with encryption, so this change updates
vold to work with that. More cleanup is possible, but the main goal of the
filesystem manager was to enable e2fsck, not a full cleanup of encryption.
Change-Id: I00ea80a923d14770ed8fdd190e8840be195f8514
Kenny Root [Fri, 27 Apr 2012 22:33:58 +0000 (15:33 -0700)]
Fix truncation of ASEC ids
Change-Id: I1e6bfcc6b0a5be47e6fd19922fc81669f61b5dba
Kenny Root [Fri, 27 Apr 2012 22:33:58 +0000 (15:33 -0700)]
Fix truncation of ASEC ids
Change-Id: I1e6bfcc6b0a5be47e6fd19922fc81669f61b5dba
Kenny Root [Wed, 4 Apr 2012 00:23:01 +0000 (17:23 -0700)]
Add in ext4 support for ASEC containers
Now forward locked applications will be in ASEC containers both internal
to the system and externally.
This change adds support for putting applications in ext4-based ASECs.
Change-Id: I8d6765b72dd2606e429c067b47a2dbcaa8bef37d
Mike Lockwood [Wed, 21 Mar 2012 22:45:48 +0000 (15:45 -0700)]
Merge remote-tracking branch 'goog/ics-aah-exp'
Mike Lockwood [Wed, 21 Mar 2012 22:44:48 +0000 (15:44 -0700)]
Merge commit '
43b80c229bdee7f32654e2ec561078c5c94c8851'
empty merge with -s ours
Change-Id: I4c7d6fb13e175af819cab784704e08e9189f6739
Ken Sumrall [Sat, 10 Mar 2012 01:02:58 +0000 (17:02 -0800)]
Merge "Fix vdc to add sequence number for NativeConectorDaemon"
Ken Sumrall [Sat, 10 Mar 2012 01:02:44 +0000 (17:02 -0800)]
Merge "Fix to not return a bogus decryption error when a device is not encrypted."
Ken Sumrall [Sat, 10 Mar 2012 00:48:48 +0000 (16:48 -0800)]
Fix vdc to add sequence number for NativeConectorDaemon
NativeConnectorDaemon was changed to use an optional sequence number,
and most services were changed to require it. Now that vold requires
a sequence number, vdc must provide one.
Change-Id: Ibdff9878faf19eae25525221c80bcb5e5f87cfea
Glenn Kasten [Wed, 7 Mar 2012 15:15:48 +0000 (07:15 -0800)]
Merge "Use sched_policy to avoid hard-coded cpuctl path"
Glenn Kasten [Mon, 5 Mar 2012 23:14:33 +0000 (15:14 -0800)]
Use sched_policy to avoid hard-coded cpuctl path
Change-Id: I8f62287d1b60d8eef72d1dfc64be5c3d56e9f498
Robert Greenwalt [Thu, 16 Feb 2012 22:43:03 +0000 (14:43 -0800)]
Use the new command numbering scheme.
Support multiple commands on a single socket via command numbers.
NativeDaemonConnector has been changed, so we need to use it here
too.
bug:
5864209
Change-Id: Ie06e966d50057d122a958377731c0385ea367b69
Nick Kralevich [Thu, 23 Feb 2012 21:20:30 +0000 (13:20 -0800)]
vold: add -Werror=format
Stop format string bugs from creeping into root level processes.
Change-Id: Ifa19ac0cacba76392040ab16cebe557b5b016706
Mike Lockwood [Wed, 15 Feb 2012 21:43:28 +0000 (13:43 -0800)]
Add support for wiping data immediately if crypt fails
Needed for headless devices that need to recover with no user intervention
Bug:
5556856
Change-Id: I0f85591df513a6893324fb057bde114ac1df044b
Signed-off-by: Mike Lockwood <lockwood@google.com>
Mike Lockwood [Wed, 15 Feb 2012 21:43:28 +0000 (13:43 -0800)]
Add support for wiping data immediately if crypt fails
Needed for headless devices that need to recover with no user intervention
Bug:
5556856
Change-Id: Iabe5d68599259b14626bfcf45e6697d81b866101
Signed-off-by: Mike Lockwood <lockwood@google.com>
Ken Sumrall [Thu, 15 Dec 2011 05:24:27 +0000 (21:24 -0800)]
Fix to not return a bogus decryption error when a device is not encrypted.
If there is filesystem damage on a non-encrypted device, and /data is not
mountable, and if the device stores the keys in a file on a different
partition (like on Crespo) then, vold would return an error which caused
the crypto UI to present an option to the user to wipe the device because
it assumed encryption had failed. This fixes it to not do that.
Change-Id: Ibff6299787b45768416dbc4052de7db3b140b808
Ed Heyl [Fri, 28 Oct 2011 19:06:01 +0000 (19:06 +0000)]
keep previous history after reset to mr1 plus aah changes (ics-aah-wip)
Ed Heyl [Wed, 26 Oct 2011 21:53:28 +0000 (21:53 +0000)]
undo reset to ics-mr1 until we have a better method
Ed Heyl [Wed, 26 Oct 2011 18:50:28 +0000 (18:50 +0000)]
reset to ics-mr1, but keep history
Steve Block [Tue, 25 Oct 2011 17:59:51 +0000 (10:59 -0700)]
am
8c487331: (-s ours) Rename LOG() to ALOG() DO NOT MERGE
* commit '
8c4873319a77c54cc198a4e5f4429099ff9da4f7':
Rename LOG() to ALOG() DO NOT MERGE
Steve Block [Wed, 12 Oct 2011 16:28:59 +0000 (17:28 +0100)]
Rename LOG() to ALOG() DO NOT MERGE
See https://android-git.corp.google.com/g/#/c/141576
Bug:
5449033
Change-Id: Icc1c76abe506d53c07c7c3db526c6fa05f73988b
Ken Sumrall [Wed, 5 Oct 2011 03:38:29 +0000 (20:38 -0700)]
Add the new verifypw command to vold/cryptfs
This vold command returns 0 if the given password matches the password
used to decrypt the device on boot. It returns 1 if they don't match,
and it returns -1 on an internal error, and -2 if the device is not encrypted.
Also check the uid of the sender of the command and only allow the root and
system users to issue cryptfs commands.
Change-Id: I5e5ae3b72a2d7814ae68c2d49aa9deb90fb1dac5
Ken Sumrall [Wed, 14 Sep 2011 23:53:46 +0000 (16:53 -0700)]
Fix cryptfs to work with a raw block device for key storage
If a raw block is specified for key storage, do not try to force the size
of the file to 16 Kbytes when writing the keys, and do not complain if
the size is not 16 Kbytes when reading the keys. Only do them if the
keyfile is a regular file.
Change-Id: I4de1cb7c3614479d93289d4f2767ca6ce1bbbc73
Ken Sumrall [Wed, 31 Aug 2011 23:14:23 +0000 (16:14 -0700)]
Add the ability to revert a crypto mapping when unmounting a volume
Add the force_and_revert option to the unmount command which will force
the unmount, and revert a crypto mapping. This is used during factory
reset so that when the internal sdcard volume is formatted, it formats
the raw device, not the encrypted mapping.
Change-Id: I36b6ff9bb54863b121de635472a303bf4a2334a9
The Android Open Source Project [Mon, 18 Jul 2011 15:10:23 +0000 (08:10 -0700)]
Reconcile with gingerbread-release
Change-Id: Ia9383258bc25f7a82628a1c7238140b810e2f3d3
David 'Digit' Turner [Thu, 14 Jul 2011 17:56:08 +0000 (10:56 -0700)]
am
6c190fd3: am
137858b4: resolved conflicts for merge of
5284bcff to gingerbread-plus-aosp
* commit '
6c190fd326099d8315e194b0ad0a173e21146e14':
Avoid array overrun. We can now mount the /sdcard partition on our boot sdcards
David 'Digit' Turner [Thu, 14 Jul 2011 16:18:29 +0000 (09:18 -0700)]
am
137858b4: resolved conflicts for merge of
5284bcff to gingerbread-plus-aosp
* commit '
137858b43b7e0ed46fb8ebce9230eb40f0a62432':
Avoid array overrun. We can now mount the /sdcard partition on our boot sdcards
David 'Digit' Turner [Thu, 14 Jul 2011 05:35:14 +0000 (07:35 +0200)]
resolved conflicts for merge of
5284bcff to gingerbread-plus-aosp
Change-Id: I108a0c32efb5add1fec41bfe76f041971801d48d
Jeff Brown [Tue, 12 Jul 2011 19:17:00 +0000 (12:17 -0700)]
Merge "Remove the simulator target from all makefiles. Bug:
5010576"
Jeff Brown [Tue, 12 Jul 2011 05:12:37 +0000 (22:12 -0700)]
Remove the simulator target from all makefiles.
Bug:
5010576
Change-Id: I7e531101ae057fb059d7d56c99433c4d66e866dc
Ken Sumrall [Mon, 11 Jul 2011 22:51:09 +0000 (15:51 -0700)]
Merge "Prevent sharing or formatting of a vold managed volumes during encryption."
Ken Sumrall [Mon, 11 Jul 2011 22:38:57 +0000 (15:38 -0700)]
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
Ken Sumrall [Mon, 11 Jul 2011 22:37:05 +0000 (15:37 -0700)]
Merge "Fix to display the proper percentage complete during encryption."
Ken Sumrall [Wed, 29 Jun 2011 01:45:14 +0000 (18:45 -0700)]
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
android-merger [Fri, 8 Jul 2011 19:29:24 +0000 (12:29 -0700)]
reset, and keep history
David 'Digit' Turner [Fri, 8 Jul 2011 16:19:06 +0000 (18:19 +0200)]
merge intel x86 patches into gingerbread branch
The Android Open Source Project [Thu, 7 Jul 2011 22:22:42 +0000 (15:22 -0700)]
Reconcile with gingerbread-release
Change-Id: I3cb3d915837ebe59c2d7007d71ef3a1f334e9b8b
android-merger [Thu, 7 Jul 2011 21:54:24 +0000 (14:54 -0700)]
Revert "add bounds checking for mPartMinors[]"
This reverts commit
f3d3ce5e53ab7928f4c292c183c417a1bd051151.
android-merger [Thu, 7 Jul 2011 21:54:01 +0000 (14:54 -0700)]
Revert "vold: Enable the SO_PASSCRED socket option"
This reverts commit
c51920c82463b240e2be0430849837d6fdc5352e.
Joseph Lehrer [Mon, 11 Apr 2011 22:02:50 +0000 (15:02 -0700)]
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>
Mike Lockwood [Wed, 29 Jun 2011 13:46:53 +0000 (06:46 -0700)]
am
273d3549: am
2c9d8de7: Merge "Prevent buffer overflows."
* commit '
273d3549198d144331f3e502eeb1215417d72b16':
Prevent buffer overflows.
Mike Lockwood [Wed, 29 Jun 2011 13:42:33 +0000 (06:42 -0700)]
am
2c9d8de7: Merge "Prevent buffer overflows."
* commit '
2c9d8de79a0dd7f894c65777a197c86486aff96c':
Prevent buffer overflows.
Mike Lockwood [Wed, 29 Jun 2011 13:30:38 +0000 (06:30 -0700)]
Merge "Prevent buffer overflows."
Dianne Hackborn [Mon, 27 Jun 2011 20:37:07 +0000 (13:37 -0700)]
Add new vold call to get the path to an asec fs.
Change-Id: Ife15628ed6e2493c9e85a2ade6d59a194fdddde5
Peter Bohm [Fri, 1 Apr 2011 10:35:25 +0000 (12:35 +0200)]
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>
Mike Lockwood [Tue, 7 Jun 2011 17:51:38 +0000 (10:51 -0700)]
Update path for seting USB mass storage backing store
Change-Id: I0e5fab1624e5ef5d2f55e2584d8adc1b6bab91b0
Signed-off-by: Mike Lockwood <lockwood@android.com>
Mike Lockwood [Sat, 18 Jun 2011 03:55:07 +0000 (20:55 -0700)]
Merge "Remove obsolete code for monitoring USB status"
Ken Sumrall [Tue, 14 Jun 2011 22:30:36 +0000 (15:30 -0700)]
Merge "Don't abort the encryption process if an internal volume is present but unmounted."
Ken Sumrall [Tue, 14 Jun 2011 21:01:55 +0000 (14:01 -0700)]
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
Nick Kralevich [Thu, 9 Jun 2011 18:27:38 +0000 (11:27 -0700)]
am
598e833d: am
b20d54b2: Merge "fix double closing file descriptors"
* commit '
598e833d42a687259bc3c9a5a39ad9ba8b105cbb':
fix double closing file descriptors
Bruce Beare [Thu, 22 Jul 2010 20:23:33 +0000 (13:23 -0700)]
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>
Nick Kralevich [Tue, 7 Jun 2011 23:28:11 +0000 (16:28 -0700)]
am
b20d54b2: Merge "fix double closing file descriptors"
* commit '
b20d54b2309adee8d192942015740735ded975d3':
fix double closing file descriptors
Nick Kralevich [Tue, 7 Jun 2011 22:44:51 +0000 (15:44 -0700)]
Merge "fix double closing file descriptors"
Mike Lockwood [Tue, 7 Jun 2011 15:34:08 +0000 (08:34 -0700)]
Remove obsolete code for monitoring USB status
Change-Id: I8ac8900b3135f03b7717540b825ff6df76f31c0b
Signed-off-by: Mike Lockwood <lockwood@android.com>
Robert CH Chou [Mon, 6 Jun 2011 13:32:45 +0000 (21:32 +0800)]
fix double closing file descriptors
Change-Id: I243628b77a0b7b138785167ccb5520e1a9374a78
Ken Sumrall [Thu, 19 May 2011 00:20:07 +0000 (17:20 -0700)]
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
The Android Open Source Project [Fri, 20 May 2011 21:19:46 +0000 (14:19 -0700)]
Reconcile with gingerbread-release honeycomb-release
Change-Id: I70f4170b78ed5412a4addd3c603c8ff52c8cfa0d
The Android Automerger [Fri, 13 May 2011 21:27:41 +0000 (14:27 -0700)]
merge in gingerbread-release history after reset to gingerbread
The Android Automerger [Mon, 9 May 2011 17:53:17 +0000 (10:53 -0700)]
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
The Android Automerger [Mon, 9 May 2011 17:40:33 +0000 (10:40 -0700)]
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
The Android Automerger [Mon, 9 May 2011 05:45:47 +0000 (22:45 -0700)]
Merge remote branch 'goog/honeycomb-mr2' into honeycomb-LTE
Mike Lockwood [Wed, 4 May 2011 19:45:42 +0000 (12:45 -0700)]
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.
Mike Lockwood [Wed, 4 May 2011 19:45:40 +0000 (12:45 -0700)]
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
Mike Lockwood [Wed, 4 May 2011 15:53:26 +0000 (08:53 -0700)]
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.
Mike Lockwood [Wed, 4 May 2011 15:53:25 +0000 (08:53 -0700)]
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
Mike Lockwood [Fri, 25 Mar 2011 19:37:43 +0000 (12:37 -0700)]
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>
Mike Lockwood [Wed, 23 Mar 2011 18:55:49 +0000 (14:55 -0400)]
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>
Mike Lockwood [Fri, 25 Mar 2011 19:37:43 +0000 (12:37 -0700)]
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>
Mike Lockwood [Wed, 23 Mar 2011 18:55:49 +0000 (14:55 -0400)]
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>
Nick Kralevich [Fri, 29 Apr 2011 23:07:45 +0000 (16:07 -0700)]
DirectVolume: don't continue on invalid PARTN value
Change-Id: I1e434c5b47b40fabaf1e702d7f2e43a88c0497dc
Conley Owens [Tue, 26 Apr 2011 23:08:13 +0000 (16:08 -0700)]
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)
Conley Owens [Tue, 26 Apr 2011 23:05:29 +0000 (16:05 -0700)]
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)