Bug: 17572886
Change-Id: I91302ccc284e0f908299852650db5bf645f2ff71

* commit '6efa9351a257edc53ce07eb8c544ccf08efb64ae':
Don't use deprecated OpenSSL functions.

* commit '6efa9351a257edc53ce07eb8c544ccf08efb64ae':
Don't use deprecated OpenSSL functions.

* commit '8e3f4510a88871a2d489ca4cdf7b738d4229053d':
HACK: Retry/reboot when mount reports busy.

Change-Id: I224499833777ef80d85c1199f475f5ed1568d053

This is a hack because we don't know why mount() reports busy.

Requires dependent change in sys...

Don't manually include stlport, and don't use private bionic headers.

Change-Id: I44dd212fdd587...

* commit '7e17e2d226783a2e065a194e60c061c255cebaae':
Don't worry about battery levels when enc...

This is a deliberately minimalistic change. There is another
defect to remove all this code - re...

* commit 'e17a9c4ad3ebb4051853a4860b18973e1a01ce11':
Change cryptfs keymaster padding to ensur...

to ensure the padded message is never larger than the RSA public
modulus.

Bug: 17358530

Change-...

* commit 'b2f682bda8443fb93ab67f19be84fd80d5ed2838':
Fix Shamus bricked by encryption upgrade

Bug: 17358530
Change-Id: I95207b62131224a2ed7ae3b75621a09acd69ea79

* commit '47ba10d6d53e0d2e54453fe62324afdfa8d6c78a':
Pad object to proper size before signing.

This change simply switches from the deprecated
EVP_{En|De}crypt{Init|Final} to the newer, _ex v...

Correct implementations of keymaster should reject using an n-bit
RSA key to sign less than n bi...

* commit '60dec16c5026d29a52791ad790860d247f47f8f2':
Correctly remove asecs for full disk encr...

Previously this would fail if the framework wasn't stopped. The failure
would then stop full dis...

* commit '74f29f1df7d12c0cc06e9d6685adf15e757d8eda':
Don't test mount when we can use the cryp...

Note that this also changes the boot sequence, and moves the test for corrupted
data to cryptfs_...

* commit '00786076cd6a3a32a42f95b4813ea807321b3fda':
Don't reboot after default encrypting

* commit '715775046c79f04d8975da53efcfbd1b70abe699':
Show correct remaining time

In field reports, sometimes the remaining time gets stuck for many
minutes. This has to be cause...

* commit '43ed123d3fc1a3edf3660cd0e2528e971abc399e':
ASEC resize tweaking, allow read-write mo...

Resize is no-op when sector count is unchanged; the caller can't
anticipate how vold does its se...

Instead trigger normal default encryption mount

Requires matching change to system/core: https:...

* commit 'e82df164e8128ec9df0072c4a4f3d92e79a0f5f4':
Revert "Revert "cryptfs: Added support fo...

This reverts commit a70abc60091aed3c3eaf8bc8e1766e233c1c3a2f.

Change-Id: Ic41d1924638586cf9b229...

* commit '52f5425ff53216e3d7e2410bffd05e0df2b13c9c':
Fix Vold to properly handle full-disk fil...

(full-disk: no partitions)

In Android, Vold recognizes a USB drive having a full-disk file syst...

* commit 'a70abc60091aed3c3eaf8bc8e1766e233c1c3a2f':
Revert "cryptfs: Added support for f2fs f...

* commit '74c01201dec12b5de43ba0f20a2f38e835cd00af':
cryptfs: Added support for f2fs fast encr...

* commit '211c0cfda6c38469180a8ae87228603d7f317778':
Enable SD card format

This reverts commit 74c01201dec12b5de43ba0f20a2f38e835cd00af.

Change-Id: Ib397a2b5812179ee2e2b6...

Bug: 15749466
Change-Id: I25452a05e1cbe90ac6603a89db9b720c7ab17e55
Signed-off-by: Daniel Rosenbe...

Store salted scrypt of intermediate key in crypto header

When mount fails, check if matches, an...

As it is not upstream, it doesn't belong in the external/kernel-headers
... or in bionic's clean...

Bug: 15593563
Change-Id: I2b5fbbfb694e1b87de6c14ab63f1a5f803bbbc36

Set flag on starting encryption to say it failed, and only clear
when we get into a recoverable ...

This adds an "fstrim dodtrim" command which will attempt to use
the FIDTRIM ioctl() if FIDTRIM i...

Initialize mIsDecrypted to prevent from formatting SD failure

Change-Id: I30851e6b01b0999bf0b8c...

Sometimes when an sdcard is already mounted,
some info like uuid and label are not re-broadcast ...

Updated cluster size to be 32k, and aligned the starting cluster of the root
directory to be clu...

When an SD card has no MBR it cannot be formatted
and then mounted by Android. This is because
t...

Change-Id: Ic5313289d826bac74c3466b33f1f167a8f0955ad

Change-Id: I1568def8839bed4d4d2dadbd97194d5603edc627

* commit 'c0c2867518eed4539444434c95fad8185a6ac08e':
Fix vold %lld to PRId64.

Change-Id: I6eb9f21fff124b8b22f4fae2ac74c2b41d93b384

When a crypto is enabled with a wipe flag (obsolete?),
it will correctly handle the fstab's choi...

From Shawn Heo's patch:

Ext4 introduced reserved clusters to prevent costly zeroout, or
unexpec...

ASECs formatted as ext4 can now be resized using vdc asec resize.
Refactored some common code.
R...

The code was using encrypted_upto == 0 as an indicator that encryption
has succeeded. This meant...

* commit 'df293f14f5bdb4f572c7f836ebb0802a177836ff':
Fix encryption on Nakasi

* commit 'ea256025669f4a5dd8c59e4c70ec7154a198be48':
Replaces uses of index() with strchr().

* commit '45faade28ae9e245e7c611c26990254aba006d2a':
Replaces uses of index() with strchr().

@bug 15159008

Change-Id: I6a96eeab180dceb0613202ba5d252036a0d5376f

Bug: 12975202
Change-Id: I7e4adfa2c4951055bbb2c11986a7784f465f586f

Bionic is removing index() because it was removed from POSIX 2008.

Change-Id: I704fb8962ff2c08b...

Changed ext4 to be 4kb aligned, and fat to be 32kb aligned.
Fixed issue that could potentially c...

* commit '099b20f3ce42a49ba49a1a70a818047ea59612ad':
vold: wildcard support for device path ma...

* commit '1881395b696017dfb40a01e718cc8dc2ea7a38e9':
vold: wildcard support for device path ma...

* commit 'c6752b06987207bd69b12ad1feadd358e296d52e':
vold: wildcard support for device path ma...

Add support for the storage with non-sequential partition index
Ex: if using extended partition...

Change-Id: I4838d384e14a7c2c0b607c0bd693e9c7bef75fb7

Must limit vold calls to fs_mkdirs() only when the volume is mounted.
If NOT, it will trigger se...

We need to make sure we don't try to read the flags on keymaster
version 2 or below, or we get r...

We need to make sure we don't try to read the flags on keymaster
version 2 or below, or we get r...

Switching the kernel to the new sysfs layout (unselecting
CONFIG_SYSFS_DEPRECATED) complicates V...

* commit '2d3c0c05e9cce7bad6afd3ceacca85b297367894':

* commit '598fdf7abe087a3f45b5ab0c932ad339b2e5bb4a':

* commit 'a7a612bf9b302962908f709ccc27a781356ac73b':

* commit '02cb9f5ea3c1177f89e7403bc253164e4a65cbfe':

* commit 'e8a19bdba03cdb323732fc9d4178456a87ee11d5':

* commit '15c3e01e05359fb11ce5e63934d7c3d54d0d6e93':

* commit 'a821d50bd43809414521590ebe65601b823f8095':

* commit '9aace96cd0f4606d48d7d9052fb134f80a5c961c':

* commit '3d9b98cc833dc7c07da6bb0cc27926c68b63c276':

* commit '4c20805a33ff194454e5cce3de44943a245e5a44':