GitLab

* commit '2eaf7138':
  Cleanup a few issues with the cryptfs code.

Now that the framework shuts down quickly, remove the 30
second sleep when enabling crypto.  Also, stop spewing
the secret master key to the disk in the system log!

Change-Id: Icb3f9456ababe3dff8de52cbbae92da0e9e5dd2f

This reverts commit 499806cd.

Change-Id: I3526b1920817c2a28ac3e84c1ea278932a9ec895

There are still a few hacks and performance issues related
to shutting down the framework in this code, but it is
functional and tested.  Without the UI changes, it requires
cryptic adb shell commands to enable, which I shall not
utter here.

Change-Id: I0b8f90afd707e17fbdb0373d156236946633cf8b

Change-Id: I9770ab880f379e2f7f6a93d3c84990edec60a116
Signed-off-by: Mike Lockwood <lockwood@android.com>

* commit 'c1d80272':
  vold: replace strsep by strtok_r

* commit '08da5c1f':
  vold: replace strsep by strtok_r

It permits more white spaces between words in vold.fstab.

Change-Id: I38250c3dcc860643e4f102e980fe844693a1451a

* commit '1206e872':
  vold: fix an offset one bug that makes partition 4 unusable
  vold: set state back to idle on formatting error

Change-Id: I103db47198ad09783aa6539cde271df0fdb9c594

* changes:
  vold: fix an offset one bug that makes partition 4 unusable
  vold: set state back to idle on formatting error

Change-Id: Ic8e18e6191ad7ee33162e36060b57a6802cf0883

Change-Id: I9f71b5e871671d1d64ad37f78a8944653409b8e1

On formatting error due to some reasons, the state is left at
Formatting, therefore the user is unable to mount the sdcard
again. The patch sets the state to Idle no matter formatting
error or not.

Change-Id: I62c78eb8299cc397ee5cc442890f8b3dbf09425c

* commit 'a28056b3':
  Set VM dirty ratio to zero when UMS is active

Improves UI responsiveness when copying large amount of data to the device.

BUG: 3131847

Change-Id: I4aa5ade7e2cd7e5110c8f0f7ee43bdc57577e11d
Signed-off-by: Mike Lockwood <lockwood@google.com>

Merge commit '918e5f9f' into gingerbread-plus-aosp

* commit '918e5f9f':
  Better error code for unmounting not-mounted volumes

ENOENT is more descriptive than the generic error that EINVAL gets
turned into. Then we can actually treat it how we want on the other
side.

Change-Id: I9b4f3be6308e13f680eae368d2167ab9ee6aae5f

Merge commit 'cbacf78e' into gingerbread-plus-aosp

* commit 'cbacf78e':
  Track type of container mounted

OBB and ASEC are tracked in the same active container list, but when it
comes time to unmount everything, it was trying to unmount the OBBs
according to ASEC rules. This led to the OBB not being unmounted and the
volume unmount failing.

Change-Id: I12c1d4d387b8022185d552b63edd61a50b9c0fc3

Merge commit 'a4886f1f' into gingerbread-plus-aosp

* commit 'a4886f1f':
  More fixes for internal FAT partitions:

Fix formatting partitions beyond the first partition.
Do not try to initialize the MBR when formatting only a single partition.

Change-Id: Ifbbd279b1c288b7b1b884a1a89248e3086ed735f
Signed-off-by: Mike Lockwood <lockwood@android.com>

Merge commit '1b15d463' into gingerbread-plus-aosp

* commit '1b15d463':
  Add some missing closes on error conditions.

Also, some formatting fixes to get back into line with netd's copy of
logwrapper.c.

Change-Id: Id471b99e9c3c8c9bb0890ca0d5e1567125e35bd7

Merge commit '2dfe297e' into gingerbread-plus-aosp

* commit '2dfe297e':
  Fixes for devices with internal FAT file system:

Only share a single partition via UMS if a specific partition
is specified in vold.fstab (rather than "auto")

Do not fail to reformat if MBR cannot be found.

Change-Id: I544ca2ee325c308af656ab9f4732c788a964c156
Signed-off-by: Mike Lockwood <lockwood@android.com>

Merge commit 'a3e06084' into gingerbread-plus-aosp

* commit 'a3e06084':
  Allow execute on mounted ASEC and OBB containers

This allows us to place shared libraries in these containers which may
only be loaded if they are executable.

Change-Id: I78fa9ab6d5c58ec8b98c40004da72aebc0aade2a

Merge commit '75a3e1a9' into gingerbread-plus-aosp

* commit '75a3e1a9':
  VOLD - make volume daemon to handle state change from shared to no_media

    When volume state changed from shared to no_media,
    volume is not properly unshared.

Change-Id: I0117d67da95440d982275746a166ef6f4ac1c0e2
Signed-off-by: Ethan <ethan.too@gmail.com>

Merge commit '826bec79' into gingerbread-plus-aosp

* commit '826bec79':
  vold: remove unnecessary code from VolumeManager::unshareVolume()

Merge commit 'd766090b' into gingerbread-plus-aosp

* commit 'd766090b':
  Avoid array overrun. We can now mount the /sdcard partition on our boot sdcards

Signed-off-by: Seth Forshee <seth.forshee@garmin.com>

Change-Id: I6e9db8c55db49b4aa61dd40cd59495f55e5b3368
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>

LOOP_GET_STATUS64 isn't useful here since the data contained within
isn't actually checked, so stick with the regular LOOP_GET_STATUS here
to match the struct loop_info we're using.

Change-Id: I4f9ff06fa44d4ae3aed046d423054554f9cf450b

* Rename all functions dealing with OBB files to mention Obb

* Add 'path' and 'list' functionality to OBB commands

* Store hashed filename in loop's lo_crypt_name and keep lo_file_name
  for the real source filename. That way we can recover it later with an
  ioctl call.

Change-Id: I29e468265988bfb931d981532d86d7be7b3adfc8

Allow the mounting of OBB filesystem images if they're encrypted with
twofish and in FAT filesystem format.

Change-Id: I54804e598f46b1f3a784ffe517ebd9d7626de7aa