diff options
| author | Paul Lawrence <paullawrence@google.com> | 2014-04-03 09:18:45 -0700 |
|---|---|---|
| committer | Paul Lawrence <paullawrence@google.com> | 2014-04-03 19:45:52 +0000 |
| commit | d71c31ef946b35f73a0dded0a32c6ad6afc12227 (patch) | |
| tree | e98e3479e5698ce07b8bcb9fb6951e431c8d96a3 /src/com/android/settings/CryptKeeperConfirm.java | |
| parent | 5de92cca6f79caa6ba48fe38a062099d63e5ae06 (diff) | |
| download | packages_apps_Settings-d71c31ef946b35f73a0dded0a32c6ad6afc12227.zip packages_apps_Settings-d71c31ef946b35f73a0dded0a32c6ad6afc12227.tar.gz packages_apps_Settings-d71c31ef946b35f73a0dded0a32c6ad6afc12227.tar.bz2 | |
Allow encryption when keyguard is set to pattern or no protection
Don't block based on keyguard type, and pass type to encryption function.
Circular dependency on
https://googleplex-android-review.git.corp.google.com/#/c/444200/
Bug: 13749169
Change-Id: Ica95713adca9552ae56341ff33badd1d4b748af8
Diffstat (limited to 'src/com/android/settings/CryptKeeperConfirm.java')
| -rw-r--r-- | src/com/android/settings/CryptKeeperConfirm.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/settings/CryptKeeperConfirm.java b/src/com/android/settings/CryptKeeperConfirm.java index 4822a83..71d5e96 100644 --- a/src/com/android/settings/CryptKeeperConfirm.java +++ b/src/com/android/settings/CryptKeeperConfirm.java @@ -72,7 +72,7 @@ public class CryptKeeperConfirm extends Fragment { IMountService mountService = IMountService.Stub.asInterface(service); try { Bundle args = getIntent().getExtras(); - mountService.encryptStorage(args.getString("password")); + mountService.encryptStorage(args.getInt("type", -1), args.getString("password")); } catch (Exception e) { Log.e("CryptKeeper", "Error while encrypting...", e); } |