OSDN Git Service
The Android Automerger [Thu, 15 May 2014 12:51:29 +0000 (05:51 -0700)]
merge in master-release history after reset to
8c008397141bf9a7d619eb2c53452bf3e397da39
The Android Automerger [Wed, 14 May 2014 12:51:48 +0000 (05:51 -0700)]
merge in master-release history after reset to
8c008397141bf9a7d619eb2c53452bf3e397da39
The Android Automerger [Tue, 13 May 2014 12:51:16 +0000 (05:51 -0700)]
merge in master-release history after reset to
8c008397141bf9a7d619eb2c53452bf3e397da39
The Android Automerger [Mon, 12 May 2014 12:50:20 +0000 (05:50 -0700)]
merge in master-release history after reset to
8c008397141bf9a7d619eb2c53452bf3e397da39
The Android Automerger [Sun, 11 May 2014 12:50:08 +0000 (05:50 -0700)]
merge in master-release history after reset to
8c008397141bf9a7d619eb2c53452bf3e397da39
The Android Automerger [Sat, 10 May 2014 12:51:27 +0000 (05:51 -0700)]
merge in master-release history after reset to
8c008397141bf9a7d619eb2c53452bf3e397da39
The Android Automerger [Thu, 8 May 2014 12:51:02 +0000 (05:51 -0700)]
merge in master-release history after reset to
8c008397141bf9a7d619eb2c53452bf3e397da39
Paul Lawrence [Tue, 6 May 2014 21:02:48 +0000 (14:02 -0700)]
Fix encryption on Nakasi
We need to make sure we don't try to read the flags on keymaster
version 2 or below, or we get random junk.
Requires
https://googleplex-android-review.git.corp.google.com/#/c/460689/
Bug:
14384714
Change-Id: I5a4ede1bec0347b8319cedaae6535201c122cf48
Paul Lawrence [Tue, 6 May 2014 21:02:48 +0000 (14:02 -0700)]
Fix encryption on Nakasi
We need to make sure we don't try to read the flags on keymaster
version 2 or below, or we get random junk.
Requires
https://googleplex-android-review.git.corp.google.com/#/c/460689/
Bug:
14384714
Change-Id: I5a4ede1bec0347b8319cedaae6535201c122cf48
JP Abgrall [Wed, 30 Apr 2014 12:50:51 +0000 (12:50 +0000)]
am
2d3c0c05: am
a821d50b: am
470f0b3f: Merge "Avoid segv by checking argc in "storage user <mountpoint>""
* commit '
2d3c0c05e9cce7bad6afd3ceacca85b297367894':
Nick Kralevich [Wed, 30 Apr 2014 12:50:50 +0000 (12:50 +0000)]
am
a7a612bf: am
15c3e01e: am
3c0d02aa: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
* commit '
a7a612bf9b302962908f709ccc27a781356ac73b':
Mark Salyzyn [Wed, 30 Apr 2014 12:50:50 +0000 (12:50 +0000)]
am
598fdf7a: am
3d9b98cc: am
1dc1fb4a: Merge "vold: suppress unused argument warning messages"
* commit '
598fdf7abe087a3f45b5ab0c932ad339b2e5bb4a':
Nick Kralevich [Wed, 30 Apr 2014 12:50:49 +0000 (12:50 +0000)]
am
e8a19bdb: am
9aace96c: am
311edc8c: Merge "Add SELinux restorecon calls on ASEC containers."
* commit '
e8a19bdba03cdb323732fc9d4178456a87ee11d5':
Colin Cross [Wed, 30 Apr 2014 12:50:49 +0000 (12:50 +0000)]
am
02cb9f5e: am
4c20805a: am
1d8e3ce8: Merge "vold: fix errors inside ALOGV"
* commit '
02cb9f5ea3c1177f89e7403bc253164e4a65cbfe':
JP Abgrall [Wed, 30 Apr 2014 01:00:10 +0000 (01:00 +0000)]
am
a821d50b: am
470f0b3f: Merge "Avoid segv by checking argc in "storage user <mountpoint>""
* commit '
a821d50bd43809414521590ebe65601b823f8095':
Nick Kralevich [Wed, 30 Apr 2014 01:00:10 +0000 (01:00 +0000)]
am
15c3e01e: am
3c0d02aa: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
* commit '
15c3e01e05359fb11ce5e63934d7c3d54d0d6e93':
Mark Salyzyn [Wed, 30 Apr 2014 01:00:09 +0000 (01:00 +0000)]
am
3d9b98cc: am
1dc1fb4a: Merge "vold: suppress unused argument warning messages"
* commit '
3d9b98cc833dc7c07da6bb0cc27926c68b63c276':
Nick Kralevich [Wed, 30 Apr 2014 01:00:09 +0000 (01:00 +0000)]
am
9aace96c: am
311edc8c: Merge "Add SELinux restorecon calls on ASEC containers."
* commit '
9aace96cd0f4606d48d7d9052fb134f80a5c961c':
Colin Cross [Wed, 30 Apr 2014 01:00:08 +0000 (01:00 +0000)]
am
4c20805a: am
1d8e3ce8: Merge "vold: fix errors inside ALOGV"
* commit '
4c20805a33ff194454e5cce3de44943a245e5a44':
Paul Lawrence [Fri, 18 Apr 2014 20:26:10 +0000 (20:26 +0000)]
Merge "Add keymaster support to cryptfs"
Paul Lawrence [Mon, 14 Apr 2014 19:17:14 +0000 (12:17 -0700)]
Add keymaster support to cryptfs
Use keymaster to wrap the cryptfs keys.
Requires selinux change
https://googleplex-android-review.git.corp.google.com/#/c/449411
Bug:
9467042
Change-Id: If25a01cb85ed193a271d61382de0560d85553b7e
Mohamad Ayyash [Wed, 16 Apr 2014 17:54:35 +0000 (17:54 +0000)]
Merge "vdc: fix segfault"
Mohamad Ayyash [Wed, 16 Apr 2014 01:08:05 +0000 (18:08 -0700)]
vdc: fix segfault
Change-Id: I1a35fe15b311d3f5203c5bc02d3db87e942cf554
Paul Lawrence [Fri, 4 Apr 2014 18:11:56 +0000 (18:11 +0000)]
Revert "Revert "Encrypt phone even if pattern or no keyguard""
Don't block based on keyguard type, and pass type to encryption function.
Requires:
https://googleplex-android-review.git.corp.google.com/#/c/444201/
or encryption will no longer work.
This reverts commit
efec3f2927c45979db2b78e7a6228d08aafb5e42.
Change-Id: I431589a56eb11118027e0a5a84f55e973b1084aa
Paul Lawrence [Thu, 3 Apr 2014 20:55:47 +0000 (20:55 +0000)]
Revert "Encrypt phone even if pattern or no keyguard"
This reverts commit
5cc86c57416eccb70dcc949d68587f08726f96fa.
Without two more commits, this will break encryption. I'll re-commit when the other two pass code review.
Change-Id: I71720d065c16cf0f7f534e74ffe883f1e113c477
Paul Lawrence [Wed, 2 Apr 2014 20:34:36 +0000 (13:34 -0700)]
Encrypt phone even if pattern or no keyguard
Add option to enablecrypto to take type, allowing us to set type
when encrypting.
Bug:
13749169
Change-Id: If22fcfa93f1ebd1a5bd3b0077bb3bd8ae71fe819
Paul Lawrence [Mon, 24 Mar 2014 17:51:59 +0000 (17:51 +0000)]
Merge "Fix setfield/getfield"
Paul Lawrence [Fri, 21 Mar 2014 20:40:36 +0000 (20:40 +0000)]
Merge "Store password in vold"
Paul Lawrence [Thu, 20 Feb 2014 20:21:31 +0000 (12:21 -0800)]
Don't corrupt ssd when encrypting and power fails
Stop encryption when battery is low, mark position, and continue on reboot.
Note - support for multiple encrypted volumes removed as no devices seem
to exist with an fstab that uses this feature. If you want support for such
a device, contact me and we will re-add it with appropriate testing.
Bug:
13284213
Change-Id: I1f7178e4f7dd8ea816cbc03ab5c4f6543e98acaa
Paul Lawrence [Mon, 10 Mar 2014 20:20:50 +0000 (13:20 -0700)]
Store password in vold
If we are not to double prompt, we need to pass the password from
CryptKeeper to KeyStore. Since the entire framework is taken down
and restarted, we must store the password in a secure system daemon.
There seems no better way than holding it in vold.
Change-Id: Ia60f2f051fc3f87c4b6468465f17b655f43f97de
Paul Lawrence [Mon, 17 Mar 2014 21:10:51 +0000 (14:10 -0700)]
Fix setfield/getfield
Check for versions >= feature version, not equal
Bug:
13526708
Change-Id: Ie07f6334e6b7c5ca0d7f83ba00827a508e2c2963
JP Abgrall [Thu, 13 Mar 2014 15:54:36 +0000 (15:54 +0000)]
am
470f0b3f: Merge "Avoid segv by checking argc in "storage user <mountpoint>""
* commit '
470f0b3ff46493b4a46b3599db33a29e94615d30':
Avoid segv by checking argc in "storage user <mountpoint>"
Mohamad Ayyash [Wed, 12 Mar 2014 22:06:56 +0000 (22:06 +0000)]
Merge "vold: Add a new mountall command."
JP Abgrall [Wed, 12 Mar 2014 20:35:03 +0000 (20:35 +0000)]
am
a29997ae: am
470f0b3f: Merge "Avoid segv by checking argc in "storage user <mountpoint>""
* commit '
a29997ae260d3d7cf41c40d9c7ba42b761b12d30':
Avoid segv by checking argc in "storage user <mountpoint>"
Mohamad Ayyash [Mon, 10 Mar 2014 22:55:33 +0000 (15:55 -0700)]
vold: Add a new mountall command.
This enables running "vdc mountall" in filesystem recovery tests where a partition is first unmounted then corrupted, and then finally verified that it's properly recovered and remounted successfully (i.e. running e2fsck..etc.).
Change-Id: I9385180afaef70f9cc6b2920d2a3c6ff13203b4e
JP Abgrall [Wed, 12 Mar 2014 18:02:31 +0000 (18:02 +0000)]
am
470f0b3f: Merge "Avoid segv by checking argc in "storage user <mountpoint>""
* commit '
470f0b3ff46493b4a46b3599db33a29e94615d30':
Avoid segv by checking argc in "storage user <mountpoint>"
JP Abgrall [Wed, 12 Mar 2014 17:56:32 +0000 (17:56 +0000)]
Merge "Avoid segv by checking argc in "storage user <mountpoint>""
JP Abgrall [Wed, 12 Mar 2014 17:41:05 +0000 (10:41 -0700)]
Avoid segv by checking argc in "storage user <mountpoint>"
Change-Id: Iffd67746e2e273c4c3f87741e5f13aa511ccb557
Signed-off-by: JP Abgrall <jpa@google.com>
Nick Kralevich [Fri, 7 Mar 2014 02:29:39 +0000 (02:29 +0000)]
am
3c0d02aa: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
* commit '
3c0d02aa03118713e6e770b54d1c530ff866f156':
Convert all selinux_android_restorecon and _setfilecon calls to new API.
Mark Salyzyn [Fri, 7 Mar 2014 02:29:27 +0000 (02:29 +0000)]
am
1dc1fb4a: Merge "vold: suppress unused argument warning messages"
* commit '
1dc1fb4adc71ea9cf26a5033513bd3a1474f79a1':
vold: suppress unused argument warning messages
Nick Kralevich [Fri, 7 Mar 2014 02:26:58 +0000 (02:26 +0000)]
am
311edc8c: Merge "Add SELinux restorecon calls on ASEC containers."
* commit '
311edc8cb2dd5c86bad49f9696333874b400f9c4':
Add SELinux restorecon calls on ASEC containers.
Colin Cross [Fri, 7 Mar 2014 02:25:15 +0000 (02:25 +0000)]
am
1d8e3ce8: Merge "vold: fix errors inside ALOGV"
* commit '
1d8e3ce8da962e5ff98d36e75f6b02873fdddb70':
vold: fix errors inside ALOGV
Nick Kralevich [Mon, 3 Mar 2014 21:21:35 +0000 (21:21 +0000)]
am
706efb22: resolved conflicts for merge of
83755972 to klp-modular-dev-plus-aosp
* commit '
706efb2254b68a6cd2441b519dd8445ca3df362d':
Add SELinux restorecon calls on ASEC containers.
Nick Kralevich [Mon, 3 Mar 2014 21:12:46 +0000 (13:12 -0800)]
resolved conflicts for merge of
83755972 to klp-modular-dev-plus-aosp
Change-Id: I4bf4dd29a65f82f91738526b80d5b579c26f8bfe
Robert Craig [Tue, 4 Feb 2014 15:53:00 +0000 (10:53 -0500)]
Add SELinux restorecon calls on ASEC containers.
This will allow fine-grained labeling of the
contents of ASEC containers. Some of the contents
need to be world readable and thus should be
distinguishable in policy.
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
(cherry picked from commit
b9e3ba56cb4075f894a73b02ee70571456494ac1)
Change-Id: I4614af139991aa086ac14a06c70fe425888a16a1
Paul Lawrence [Fri, 7 Feb 2014 20:07:22 +0000 (12:07 -0800)]
Infrastructure to securely allow only one prompt at boot when encrypted
Add a call to vold that says if we decrypted the data partition. Reset the
flag so that it only returns true the first time.
Bug:
12990752
Change-Id: Ib00be87137c00fb8ad29205c85a3ea187764b702
Paul Lawrence [Mon, 3 Feb 2014 21:28:11 +0000 (13:28 -0800)]
Enable auto-encrypt drive at startup
Modify enablecrypto command to make the password optional. When it is
not there, default encrypt the device.
Remove a warning by making at least some parts of this file const-correct.
Bug:
11985952
Change-Id: Ie27da4c4072386d9d6519d97ff46c6dc4ed188dc
Paul Lawrence [Fri, 14 Feb 2014 15:24:12 +0000 (15:24 +0000)]
Merge "Support default, pattern, pin and password encryption types"
Nick Kralevich [Thu, 13 Feb 2014 00:19:55 +0000 (00:19 +0000)]
am
3214d1f5: am
3c0d02aa: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
* commit '
3214d1f5a4dbece12e00f1c122e4c2e291715706':
Convert all selinux_android_restorecon and _setfilecon calls to new API.
Mark Salyzyn [Thu, 13 Feb 2014 00:19:54 +0000 (00:19 +0000)]
am
49dd24c2: am
1dc1fb4a: Merge "vold: suppress unused argument warning messages"
* commit '
49dd24c238e86c57e97f919af7fbf8ee3d79b737':
vold: suppress unused argument warning messages
Nick Kralevich [Wed, 12 Feb 2014 23:19:02 +0000 (23:19 +0000)]
am
3c0d02aa: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
* commit '
3c0d02aa03118713e6e770b54d1c530ff866f156':
Convert all selinux_android_restorecon and _setfilecon calls to new API.
Mark Salyzyn [Wed, 12 Feb 2014 23:10:33 +0000 (23:10 +0000)]
am
1dc1fb4a: Merge "vold: suppress unused argument warning messages"
* commit '
1dc1fb4adc71ea9cf26a5033513bd3a1474f79a1':
vold: suppress unused argument warning messages
Nick Kralevich [Wed, 12 Feb 2014 23:09:58 +0000 (23:09 +0000)]
Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
Mark Salyzyn [Wed, 12 Feb 2014 23:03:22 +0000 (23:03 +0000)]
Merge "vold: suppress unused argument warning messages"
Paul Lawrence [Wed, 29 Jan 2014 21:31:03 +0000 (13:31 -0800)]
Support default, pattern, pin and password encryption types
Store encryption type in crypto footer, and provide functions to
manipulate it. Add mount_default_encrypted command to vdc to allow
mounting of default encrypted volumes at boot time.
Bug:
8769627
Change-Id: Ie41848f258e128b48b579e09789abfa24c95e2b2
Mark Salyzyn [Wed, 12 Feb 2014 22:16:14 +0000 (14:16 -0800)]
vold: suppress unused argument warning messages
(cherry picked from commit
3e971277db0d87652af5622c989233e7159ab909)
Change-Id: Ic1ab533f756fbd44b1f2e5ae12e2f5736ace7740
Mark Salyzyn [Tue, 21 Jan 2014 21:27:04 +0000 (13:27 -0800)]
vold: suppress unused argument warning messages
Change-Id: Ic1ab533f756fbd44b1f2e5ae12e2f5736ace7740
Stephen Smalley [Wed, 12 Feb 2014 14:43:08 +0000 (09:43 -0500)]
Convert all selinux_android_restorecon and _setfilecon calls to new API.
libselinux selinux_android_restorecon API is changing to the more
general interface with flags and dropping the older variants.
Also get rid of the old, no longer used selinux_android_setfilecon API
and rename selinux_android_setfilecon2 to it as it is the only API in use.
Change-Id: I1e71ec398ccdc24cac4ec76f1b858d0f680f4925
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Nick Kralevich [Tue, 11 Feb 2014 17:28:57 +0000 (17:28 +0000)]
am
ca3593df: am
311edc8c: Merge "Add SELinux restorecon calls on ASEC containers."
* commit '
ca3593df3d48cb4b51acf89e6df4872b922fd51d':
Add SELinux restorecon calls on ASEC containers.
Nick Kralevich [Tue, 11 Feb 2014 17:20:39 +0000 (17:20 +0000)]
am
311edc8c: Merge "Add SELinux restorecon calls on ASEC containers."
* commit '
311edc8cb2dd5c86bad49f9696333874b400f9c4':
Add SELinux restorecon calls on ASEC containers.
Nick Kralevich [Tue, 11 Feb 2014 17:13:46 +0000 (17:13 +0000)]
Merge "Add SELinux restorecon calls on ASEC containers."
Colin Cross [Mon, 10 Feb 2014 12:51:31 +0000 (12:51 +0000)]
am
e985c9ab: am
1d8e3ce8: Merge "vold: fix errors inside ALOGV"
* commit '
e985c9ab10fed452b97138170b4d69288d076b06':
vold: fix errors inside ALOGV
Colin Cross [Fri, 7 Feb 2014 21:31:53 +0000 (21:31 +0000)]
am
1d8e3ce8: Merge "vold: fix errors inside ALOGV"
* commit '
1d8e3ce8da962e5ff98d36e75f6b02873fdddb70':
vold: fix errors inside ALOGV
Colin Cross [Fri, 7 Feb 2014 21:27:34 +0000 (21:27 +0000)]
Merge "vold: fix errors inside ALOGV"
Colin Cross [Fri, 7 Feb 2014 04:34:29 +0000 (20:34 -0800)]
vold: fix errors inside ALOGV
Fix errors exposed by adding compile-time checking to disabled ALOGVs.
Change-Id: I29bd6e9a7648ccca02e0e9a96b79ee0ea7b5cfc6
Robert Craig [Tue, 4 Feb 2014 15:53:00 +0000 (10:53 -0500)]
Add SELinux restorecon calls on ASEC containers.
This will allow fine-grained labeling of the
contents of ASEC containers. Some of the contents
need to be world readable and thus should be
distinguishable in policy.
Change-Id: Iefee74214d664acd262edecbb4f981d633ff96ce
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
Paul Lawrence [Thu, 30 Jan 2014 15:34:04 +0000 (15:34 +0000)]
Merge "Fast ext4 encryption"
Paul Lawrence [Tue, 21 Jan 2014 16:23:27 +0000 (08:23 -0800)]
Fast ext4 encryption
For ext4 filesystems, only encrypt blocks in use.
Needs matching ext4 utils changes from
https://googleplex-android-review.git.corp.google.com/#/c/409575
Bug:
11985952
Change-Id: I89df051c25105daf3f469cc980195202f8be6786
Nick Kralevich [Tue, 28 Jan 2014 14:17:18 +0000 (14:17 +0000)]
Nick Kralevich [Tue, 28 Jan 2014 14:11:06 +0000 (14:11 +0000)]
Nick Kralevich [Tue, 28 Jan 2014 14:06:00 +0000 (14:06 +0000)]
Nick Kralevich [Tue, 28 Jan 2014 03:32:29 +0000 (19:32 -0800)]
Nick Kralevich [Tue, 28 Jan 2014 03:27:11 +0000 (19:27 -0800)]
Nick Kralevich [Tue, 28 Jan 2014 03:25:27 +0000 (19:25 -0800)]
Nick Kralevich [Tue, 28 Jan 2014 03:21:00 +0000 (19:21 -0800)]
am
3e03bf8a: am
fd2dcf90: am
f4770dcf: am
0de7c611: Validate asec names.
* commit '
3e03bf8a7ab9dcee8897f275c75adfcdb20e0fdc':
Validate asec names.
Nick Kralevich [Tue, 28 Jan 2014 03:19:25 +0000 (19:19 -0800)]
am
fd2dcf90: am
f4770dcf: am
0de7c611: Validate asec names.
* commit '
fd2dcf905abd3dc76738fd864e3979bd6e5ce183':
Validate asec names.
Nick Kralevich [Tue, 28 Jan 2014 03:17:13 +0000 (19:17 -0800)]
am
f4770dcf: am
0de7c611: Validate asec names.
* commit '
f4770dcf6ffe2baba16cbb290aba16f735c51962':
Validate asec names.
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
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
Change-Id: I3dd0350c79327dc91a5a10d5724d85d99814e769
Colin Cross [Fri, 24 Jan 2014 21:24:47 +0000 (21:24 +0000)]
am
353b45f8: Merge "vold: fix warnings for 64-bit"
* commit '
353b45f84fa0bde76c91d338f843ff27c6f646ad':
vold: fix warnings for 64-bit
Colin Cross [Fri, 24 Jan 2014 20:28:19 +0000 (20:28 +0000)]
Merge "vold: fix warnings for 64-bit"
Colin Cross [Thu, 23 Jan 2014 07:59:41 +0000 (23:59 -0800)]
vold: fix warnings for 64-bit
Replace MINOR(dev_t) and MAJOR(dev_t) with minor and major,
which cast to int.
Cast int to uintptr_t before casting to pointer
Change-Id: I59375518f15d27f400fcd4f8a8dfe5ebdd8350e6
Colin Cross [Thu, 23 Jan 2014 23:43:38 +0000 (23:43 +0000)]
am
8328e815: Merge "vold: remove from include path"
* commit '
8328e8150f4e7b785785754f2d44794e7bab3577':
vold: remove $(KERNEL_HEADERS) from include path
Colin Cross [Thu, 23 Jan 2014 23:02:07 +0000 (23:02 +0000)]
Merge "vold: remove $(KERNEL_HEADERS) from include path"
Colin Cross [Thu, 23 Jan 2014 07:59:16 +0000 (23:59 -0800)]
vold: remove $(KERNEL_HEADERS) from include path
The kernel headers are already in the include path, and manually
adding them again will break on a multiarch build, where the
kernel headers may be different for each arch.
Change-Id: Ifb11fa7bdff6b317c44258968244313b7039a9e1
Doug Zongker [Tue, 17 Dec 2013 17:43:23 +0000 (09:43 -0800)]
allow encrypted filesystems to be mounted readonly
By setting ro.crypto.readonly to 1, cryptfs will mount an encrypted
filesystem that is normally mounted read-write as read-only instead.
To be used when recovery mounts /data.
Bug:
12188746
Change-Id: If3f3f9a3024f29ebc4ad721a48546a332cb92b6b
JP Abgrall [Fri, 15 Nov 2013 22:25:37 +0000 (14:25 -0800)]
am
46f8c2b9: am
7bdfa52d: vold: cryptfs: Don\'t update KDF without validating pwd/key.
* commit '
46f8c2b954e11c2266871b8110b74bd6a11f3661':
vold: cryptfs: Don't update KDF without validating pwd/key.
JP Abgrall [Fri, 15 Nov 2013 22:21:32 +0000 (14:21 -0800)]
am
7bdfa52d: vold: cryptfs: Don\'t update KDF without validating pwd/key.
* commit '
7bdfa52d934465e2182e2f1c200c4d8581ad5da6':
vold: cryptfs: Don't update KDF without validating pwd/key.
JP Abgrall [Fri, 15 Nov 2013 21:42:56 +0000 (13:42 -0800)]
vold: cryptfs: Don't update KDF without validating pwd/key.
Prior to this, the Key derivation function would get
blindly updated even if the user entered the wrong password.
Now, we only attempt to upgrade the KDF if the pwd/key have
been verified (i.e. after a successful mount).
Bug:
11460197
Change-Id: I0469228cc9b87c47754e8ca3c7146651da177da5
Jeff Sharkey [Tue, 12 Nov 2013 04:51:51 +0000 (20:51 -0800)]
am
86697c72: am
6bcd362e: Handle missing UUID/LABEL from blkid.
* commit '
86697c72ae29661ad64cfd7b134fa3d3215e0cc3':
Handle missing UUID/LABEL from blkid.
Jeff Sharkey [Mon, 11 Nov 2013 23:29:25 +0000 (15:29 -0800)]
am
6bcd362e: Handle missing UUID/LABEL from blkid.
* commit '
6bcd362edd1f0ad97807276ff7f9f16991df99a4':
Handle missing UUID/LABEL from blkid.
Jeff Sharkey [Mon, 11 Nov 2013 22:46:39 +0000 (14:46 -0800)]
Handle missing UUID/LABEL from blkid.
Bug:
11627785
Change-Id: Iee757abbc3795234f41d513a6aed8ad33855cb7a
JP Abgrall [Fri, 1 Nov 2013 20:06:20 +0000 (13:06 -0700)]
vold: cryptfs: Retry encryption after killing processes using /data
Currently, if a non-framework process or service is using /data,
unmounting will fail as nothing will kill it.
Instead of rebooting on unmount failure, we now kill all processes
using /data, then try one more time.
Bug:
11291208
Change-Id: I6c5276c78aa55965914ace96e1db74dc80fca3c1
Blair Prescott [Fri, 25 Oct 2013 23:14:00 +0000 (16:14 -0700)]
am
3aefb598: am
cc21d6ea: Use correct minor device number to format SD card
* commit '
3aefb598e4811acc5a198cc9ba20025d95803353':
Use correct minor device number to format SD card
Blair Prescott [Fri, 25 Oct 2013 22:06:12 +0000 (15:06 -0700)]
am
cc21d6ea: Use correct minor device number to format SD card
* commit '
cc21d6ea5881a9f576296317bde8d818b3e4fc01':
Use correct minor device number to format SD card
Blair Prescott [Mon, 21 Oct 2013 22:25:37 +0000 (15:25 -0700)]
Use correct minor device number to format SD card
When formatting SD card partitions, instead of assuming partition
minor device numbers start from 1, use (minor device number of
the disk device + 1) as the starting point.
Bug:
11352632
Change-Id: I69d37f57aec6b62fe2a055470f7525ec09dc3859
Signed-off-by: Blair Prescott <blairp@broadcom.com>
Signed-off-by: Pierre <pierre@broadcom.com>
Jeff Sharkey [Fri, 18 Oct 2013 01:59:02 +0000 (18:59 -0700)]
am
32e20905: am
bcdbd9ac: Merge "Clean up ASEC unmounting on physical storage." into klp-dev
* commit '
32e2090562552041a15e73afcce1e9948d9eb634':
Clean up ASEC unmounting on physical storage.
Jeff Sharkey [Fri, 18 Oct 2013 01:59:02 +0000 (18:59 -0700)]
am
f4a8c0b9: am
10939ac7: Merge "Extract UUID and label from inserted volumes." into klp-dev
* commit '
f4a8c0b9f646cd9fa51fe3746bc8a00bb987124b':
Extract UUID and label from inserted volumes.
Jeff Sharkey [Fri, 18 Oct 2013 01:53:27 +0000 (18:53 -0700)]
am
bcdbd9ac: Merge "Clean up ASEC unmounting on physical storage." into klp-dev
* commit '
bcdbd9ac0657a27ff9f7772e74c45ec1e2d460c7':
Clean up ASEC unmounting on physical storage.
OSDN Git Service
