OSDN Git Service
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
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
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)
Conley Owens [Tue, 26 Apr 2011 22:58:50 +0000 (15:58 -0700)]
Ignore change "Set SO_PASSCRED on the uevent socket." in favor of change
in internal tree.
Change-Id: Ibdf7cf1e1d0ba177d9de813baa6481ddd31d5d9c
Conley Owens [Tue, 26 Apr 2011 22:36:04 +0000 (15:36 -0700)]
Merge "Set SO_PASSCRED on the uevent socket. (needed for change I393c21da)"
Vernon Tang [Mon, 25 Apr 2011 03:31:34 +0000 (13:31 +1000)]
Set SO_PASSCRED on the uevent socket. (needed for change I393c21da)
Change-Id: I09a8a6d7c654869a40339adce181e6b981f10369
Nick Kralevich [Tue, 19 Apr 2011 22:44:57 +0000 (15:44 -0700)]
am
b510cd4e: am
77992e71: vold: Enable the SO_PASSCRED socket option
* commit '
b510cd4e8a480cbb01ff3175f2e99b11328ff88a':
vold: Enable the SO_PASSCRED socket option
Nick Kralevich [Tue, 19 Apr 2011 22:36:16 +0000 (15:36 -0700)]
am
77992e71: vold: Enable the SO_PASSCRED socket option
* commit '
77992e713ceac377ed226b555685f99fcfeb2c14':
vold: Enable the SO_PASSCRED socket option
Nick Kralevich [Mon, 18 Apr 2011 22:51:19 +0000 (15:51 -0700)]
vold: Enable the SO_PASSCRED socket option
Ensure that sender credentials are available when we
receive a netlink message.
This is a manual cherry-pick of
c51920c82463b240e2be0430849837d6fdc5352e
Change-Id: I98aff8733449617d35d20bff2fe77e9d3f22f57e
Nick Kralevich [Tue, 19 Apr 2011 17:38:26 +0000 (10:38 -0700)]
am
46770e6e: am
b9aa1459: am
c51920c8: vold: Enable the SO_PASSCRED socket option
* commit '
46770e6ea0876797b9f6d93e838f3d73dc91917d':
vold: Enable the SO_PASSCRED socket option
Nick Kralevich [Tue, 19 Apr 2011 17:26:07 +0000 (10:26 -0700)]
am
b9aa1459: am
c51920c8: vold: Enable the SO_PASSCRED socket option
* commit '
b9aa145910e22ed97cb51545bf399e6289bca643':
vold: Enable the SO_PASSCRED socket option
Nick Kralevich [Mon, 18 Apr 2011 22:51:19 +0000 (15:51 -0700)]
vold: Enable the SO_PASSCRED socket option
Ensure that sender credentials are available when we
receive a netlink message.
Change-Id: I48411205a8fbc1ebd29834f64028662d80f15995
Nick Kralevich [Mon, 18 Apr 2011 23:31:25 +0000 (16:31 -0700)]
am
c51920c8: vold: Enable the SO_PASSCRED socket option
* commit '
c51920c82463b240e2be0430849837d6fdc5352e':
vold: Enable the SO_PASSCRED socket option
Nick Kralevich [Mon, 18 Apr 2011 22:51:19 +0000 (15:51 -0700)]
vold: Enable the SO_PASSCRED socket option
Ensure that sender credentials are available when we
receive a netlink message.
Change-Id: I48411205a8fbc1ebd29834f64028662d80f15995
Nick Kralevich [Mon, 18 Apr 2011 19:07:41 +0000 (12:07 -0700)]
am
19df18af: am
aecf0e2a: am
f3d3ce5e: add bounds checking for mPartMinors[]
* commit '
19df18af24490f17e82758c38157750c67da245b':
add bounds checking for mPartMinors[]
Nick Kralevich [Mon, 18 Apr 2011 18:59:07 +0000 (11:59 -0700)]
am
aecf0e2a: am
f3d3ce5e: add bounds checking for mPartMinors[]
* commit '
aecf0e2a3dd1a72e448d9df7ed69533578dda12c':
add bounds checking for mPartMinors[]
Nick Kralevich [Mon, 18 Apr 2011 18:44:57 +0000 (11:44 -0700)]
am
f3d3ce5e: add bounds checking for mPartMinors[]
* commit '
f3d3ce5e53ab7928f4c292c183c417a1bd051151':
add bounds checking for mPartMinors[]
Nick Kralevich [Mon, 18 Apr 2011 18:16:13 +0000 (11:16 -0700)]
add bounds checking for mPartMinors[]
Change-Id: I6d5b26756c8434d6396f3535252608ce61eabfd8
Mike Lockwood [Fri, 25 Mar 2011 19:37:43 +0000 (12:37 -0700)]
Only create android_secure mountpoint on the primary external storage volume.
Change-Id: I4069297a799260b8ecf355e91a1594b4f03126af
Signed-off-by: Mike Lockwood <lockwood@android.com>
Mike Lockwood [Wed, 23 Mar 2011 18:55:49 +0000 (14:55 -0400)]
Mount secondary external storage writable by AID_MEDIA_RW rather than AID_SDCARD_RW
Change-Id: I8bb658bb2ab66026f0a54f9c1f80fc5c6e8d918a
Signed-off-by: Mike Lockwood <lockwood@android.com>
Ken Sumrall [Wed, 9 Mar 2011 01:07:06 +0000 (17:07 -0800)]
Load persistent properties after mounting an encrypted /data partition.
Fix for bug
3415286. Trigger an action in init.rc to load the persistent
properties after /data has been decrypted and mounted.
Change-Id: I5fe3b481bcc6963113e830728c204b22ffc3b722
Ken Sumrall [Tue, 8 Mar 2011 07:40:35 +0000 (23:40 -0800)]
Teach vold to use the new android_reboot() function.
The new android_reboot() function is a nicer way to reboot.
It can optionally sync(2) and remount as read-only writable
filesystems. This fixes bug
3350709.
Change-Id: I4618bd5e8cccdce08494a7ca3f40ef72b2875e68
Ken Sumrall [Tue, 15 Feb 2011 22:53:36 +0000 (14:53 -0800)]
Enable detection of failed encryption process, for bug
3384231.
Need to detect if the encryption process didn't finish successfully, and if
so, provide a way for the UI to detect that and give the user an option to
wipe the system clean. Otherwise, the user is stuck in a reboot loop, and
they will need to do magic button presses to enter recovery and wipe the
device to get out of it.
Change-Id: I58253e1e523ee42bdd1a59aa7d8a9d20071bd18b
The Android Automerger [Sat, 5 Feb 2011 06:25:59 +0000 (22:25 -0800)]
merge in honeycomb-release history after reset to honeycomb
The Android Automerger [Sat, 5 Feb 2011 05:55:48 +0000 (21:55 -0800)]
merge in honeycomb-release history after reset to honeycomb
The Android Automerger [Sat, 5 Feb 2011 01:35:48 +0000 (17:35 -0800)]
merge in honeycomb-release history after reset to honeycomb
The Android Automerger [Fri, 4 Feb 2011 19:49:09 +0000 (11:49 -0800)]
merge in honeycomb-release history after reset to honeycomb
The Android Automerger [Fri, 4 Feb 2011 18:26:07 +0000 (10:26 -0800)]
merge in honeycomb-release history after reset to honeycomb
The Android Automerger [Fri, 4 Feb 2011 15:19:09 +0000 (07:19 -0800)]
merge in honeycomb-release history after reset to honeycomb
The Android Automerger [Thu, 3 Feb 2011 23:26:42 +0000 (15:26 -0800)]
merge in honeycomb-release history after reset to honeycomb
The Android Automerger [Thu, 3 Feb 2011 19:23:31 +0000 (11:23 -0800)]
merge in honeycomb-release history after reset to honeycomb
The Android Automerger [Thu, 3 Feb 2011 15:17:58 +0000 (07:17 -0800)]
merge in honeycomb-release history after reset to honeycomb
The Android Automerger [Thu, 3 Feb 2011 00:13:22 +0000 (16:13 -0800)]
merge in honeycomb-release history after reset to honeycomb
The Android Automerger [Wed, 2 Feb 2011 15:21:41 +0000 (07:21 -0800)]
merge in honeycomb-release history after reset to honeycomb
Kenny Root [Wed, 2 Feb 2011 07:38:11 +0000 (23:38 -0800)]
am
18ed5640: Merge "Use LOOP_GET_STATUS64 for checking loop devices" into honeycomb
* commit '
18ed56400bb6ae999712ba70af385100d0cd6e55':
Use LOOP_GET_STATUS64 for checking loop devices
Kenny Root [Wed, 2 Feb 2011 07:33:44 +0000 (23:33 -0800)]
Merge "Use LOOP_GET_STATUS64 for checking loop devices" into honeycomb
Ken Sumrall [Wed, 2 Feb 2011 00:32:45 +0000 (16:32 -0800)]
am
7f7dbaa2: Improve detection of incomplete encryption
* commit '
7f7dbaa2784c10fd2989fb303e5edfb8136d53dc':
Improve detection of incomplete encryption
Kenny Root [Tue, 1 Feb 2011 23:58:25 +0000 (15:58 -0800)]
Use LOOP_GET_STATUS64 for checking loop devices
To determine whether a loop device was available, we use an ioctl call
to LOOP_GET_STATUS, but this fails on devices with large storage
partitions with errno = EOVERFLOW. Instead use LOOP_GET_STATUS64 which
succeeds.
Bug:
3412121
Change-Id: Ica3cb48885d3555f2d27073c00e31fc51a08c730
Ken Sumrall [Tue, 1 Feb 2011 23:46:41 +0000 (15:46 -0800)]
Improve detection of incomplete encryption
Bug
3384231 is punted to MR1, but the code to set the flag is already
in the tree, so this CL does 3 things:
1. Comments out the lines that set the flag
2. Removes the change to the checkpw that was added in the last change.
3. Implements a new command to check the flag (which no one is calling
yet and the flag won't be set anyhow).
When MR1 comes, it will be a simple matter to enable the flag setting
code and start testing it.
The fear is a false positive detection of incomplete encryption could
cause people to be prompted to wipe their data when MR1 comes out and
the flag is checked. Not setting this for first release, and testing
this more before MR1, will give us confidence that the code will not
detect false positives of encryption failure.
Change-Id: I6dfba11646e291fe5867e8375b71a53c815f3968
Ken Sumrall [Tue, 1 Feb 2011 21:27:36 +0000 (13:27 -0800)]
am
d33d417e: Detect when encryption failed to complete
* commit '
d33d417e3a057fffad22c23f5f002177531db2a5':
Detect when encryption failed to complete
The Android Automerger [Tue, 1 Feb 2011 18:12:18 +0000 (10:12 -0800)]
merge in honeycomb-release history after reset to honeycomb
Ken Sumrall [Tue, 1 Feb 2011 08:49:13 +0000 (00:49 -0800)]
Detect when encryption failed to complete
For the case there encryption failes to complete because of a kernel
crash or the user power cycling the device, define a flag in the
crypto footer that says encryption is in progress. Set it when starting
the actual encryption, and clear it when it successfully completes.
When the user is asked for the disk password, if the flag is set,
return a special error to the caller so the UI can know to tell the
user there is no valid data on the disk, and present a button to
wipe and reset the device.
Change-Id: I3723ec77f33437d94b3ac9ad5db0a5c950d11648
The Android Automerger [Tue, 1 Feb 2011 01:24:38 +0000 (17:24 -0800)]
merge in honeycomb-release history after reset to honeycomb
Ken Sumrall [Mon, 31 Jan 2011 03:44:27 +0000 (19:44 -0800)]
am
5d4c68e4: Have vold grab a partial wakelock when encrypting
* commit '
5d4c68e40700424b65a4331be75620706a0dd49c':
Have vold grab a partial wakelock when encrypting
Ken Sumrall [Mon, 31 Jan 2011 03:06:03 +0000 (19:06 -0800)]
Have vold grab a partial wakelock when encrypting
The Progress bar UI grabs a full wakelock when encrypting, but we've seen
a case where it looks like the progress bar UI crashes, and the wakelock is
lost, and then all hell breaks loose. The enablecrypto command has a lot of
work to do, and it will take some time, so it should grab a wakelock to
ensure it can finish without being interrupted and put to sleep.
It grabs a partial wake lock, as it doesn't need the screen to be on to do
its work. If the UI wants to keep it on, it should also grab a full wakelock,
which it does. If the UI crashes, the screen may turn off, but the encryption
will keep going, and vold will reboot the device when it's done.
Change-Id: I51d3a72b8c77383044a3facb1604c1ee510733ae
The Android Automerger [Sun, 30 Jan 2011 21:37:48 +0000 (13:37 -0800)]
merge in honeycomb-release history after reset to honeycomb
The Android Automerger [Sun, 30 Jan 2011 17:59:01 +0000 (09:59 -0800)]
merge in honeycomb-release history after reset to honeycomb
Ken Sumrall [Sun, 30 Jan 2011 04:50:03 +0000 (20:50 -0800)]
am
3f476690: Merge "Don\'t try to encrypt in place a filesystem that is too large and return proper errors" into honeycomb
* commit '
3f476690eaef3b824255813ed335284ef9a90e91':
Don't try to encrypt in place a filesystem that is too large and return proper errors
Ken Sumrall [Sun, 30 Jan 2011 04:45:31 +0000 (20:45 -0800)]
Merge "Don't try to encrypt in place a filesystem that is too large and return proper errors" into honeycomb
Jason parks [Sat, 29 Jan 2011 20:06:28 +0000 (12:06 -0800)]
am
70a4b3fd: Change cryptfs changepw to only require a new password.
* commit '
70a4b3fd7a84a84bbe6e9d6d4ca3ee2098259fd9':
Change cryptfs changepw to only require a new password.
Ken Sumrall [Sat, 29 Jan 2011 07:31:16 +0000 (23:31 -0800)]
Don't try to encrypt in place a filesystem that is too large and return proper errors
If the already existing filesystem encompasses the entire /data partition
and does not leave the last 16 Kbytes for the crypto footer, refuse to
do encrypt in place and return an error. This is only an issue for folks
with early development systems trying to encrypt an old /data. This should
not be seen in released devices.
Also, if there is an error, try to report back to the UI what the error was
so it can deal with it.
Change-Id: If66781a4fe03034c96c3dd12075240deb8663db0
The Android Automerger [Fri, 28 Jan 2011 23:49:15 +0000 (15:49 -0800)]
merge in honeycomb-release history after reset to honeycomb
Jason parks [Fri, 28 Jan 2011 16:10:47 +0000 (10:10 -0600)]
Change cryptfs changepw to only require a new password.
The master key is now stored unhashed in memory. This
is needed because certain operation like remote reseting
of passwords the old password is not avaliable.
The changepw interface has been changed to only take
the new password as the only argument. When this is
called we reencrypt the master key with the new password
and old salt.
Bug:
3382129
Change-Id: I9a596b89013194605d6d7790067691aa0dc75e72
The Android Automerger [Fri, 28 Jan 2011 15:25:12 +0000 (07:25 -0800)]
merge in honeycomb-release history after reset to honeycomb
The Android Automerger [Thu, 27 Jan 2011 15:26:10 +0000 (07:26 -0800)]
merge in honeycomb-release history after reset to honeycomb
The Android Automerger [Wed, 26 Jan 2011 15:26:30 +0000 (07:26 -0800)]
merge in honeycomb-release history after reset to honeycomb
The Android Automerger [Tue, 25 Jan 2011 15:26:39 +0000 (07:26 -0800)]
merge in honeycomb-release history after reset to honeycomb
The Android Automerger [Mon, 24 Jan 2011 15:22:25 +0000 (07:22 -0800)]
merge in honeycomb-release history after reset to honeycomb
The Android Automerger [Sun, 23 Jan 2011 15:22:03 +0000 (07:22 -0800)]
merge in honeycomb-release history after reset to honeycomb
The Android Automerger [Sat, 22 Jan 2011 15:23:20 +0000 (07:23 -0800)]
merge in honeycomb-release history after reset to honeycomb
Jason parks [Fri, 21 Jan 2011 00:30:39 +0000 (18:30 -0600)]
Always return success if the command was run.
The caller will check the result code for success. This prevents a exception from being thrown when the result code needs to be propagated to the caller.
Change-Id: I471e8d6eb6f339c6f4e40f47adf60d20f6a70974
Jason parks [Fri, 21 Jan 2011 20:39:35 +0000 (12:39 -0800)]
am
0167cb15: Always return success if the command was run.
* commit '
0167cb15935592deea9abbd6a8bbe904e27bd101':
Always return success if the command was run.
Jason parks [Fri, 21 Jan 2011 00:30:39 +0000 (18:30 -0600)]
Always return success if the command was run.
The caller will check the result code for success. This prevents a exception from being thrown when the result code needs to be propagated to the caller.
Change-Id: I471e8d6eb6f339c6f4e40f47adf60d20f6a70974
Ken Sumrall [Wed, 19 Jan 2011 11:48:12 +0000 (03:48 -0800)]
am
e8744070: Create and use a salt when calling pbkdf2 to encrypt/decrypt the master key.
* commit '
e87440703663f5ee326326f6438f3b00ea315623':
Create and use a salt when calling pbkdf2 to encrypt/decrypt the master key.