summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/ConfirmLockPattern.java
diff options
context:
space:
mode:
authorPaul Lawrence <paullawrence@google.com>2014-04-03 09:18:45 -0700
committerPaul Lawrence <paullawrence@google.com>2014-04-03 19:45:52 +0000
commitd71c31ef946b35f73a0dded0a32c6ad6afc12227 (patch)
treee98e3479e5698ce07b8bcb9fb6951e431c8d96a3 /src/com/android/settings/ConfirmLockPattern.java
parent5de92cca6f79caa6ba48fe38a062099d63e5ae06 (diff)
downloadpackages_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/ConfirmLockPattern.java')
-rw-r--r--src/com/android/settings/ConfirmLockPattern.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/settings/ConfirmLockPattern.java b/src/com/android/settings/ConfirmLockPattern.java
index 81b325b..a4b9991 100644
--- a/src/com/android/settings/ConfirmLockPattern.java
+++ b/src/com/android/settings/ConfirmLockPattern.java
@@ -27,6 +27,7 @@ import android.content.Intent;
import android.os.CountDownTimer;
import android.os.SystemClock;
import android.os.Bundle;
+import android.os.storage.StorageManager;
import android.widget.TextView;
import android.view.LayoutInflater;
import android.view.View;
@@ -266,6 +267,8 @@ public class ConfirmLockPattern extends SettingsActivity {
if (mLockPatternUtils.checkPattern(pattern)) {
Intent intent = new Intent();
+ intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_TYPE,
+ StorageManager.CRYPT_TYPE_PATTERN);
intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD,
LockPatternUtils.patternToString(pattern));