| commit | cc70155f3bf18341296aaa2163bd2e7df6997b11 | [log] [tgz] |
|---|---|---|
| author | Paul Crowley <paulcrowley@google.com> | Tue May 17 14:18:49 2016 -0700 |
| committer | Paul Crowley <paulcrowley@google.com> | Tue May 17 15:22:29 2016 -0700 |
| tree | 95b087437153a530cd94b0a57fc7f945e99bf522 | |
| parent | 94789b4ddff239760adf91896bd6ea86b62d0137 [diff] [blame] |
Two phases to set the password for disk encryption Revert "Revert "Two phases to set the password for disk encryption"" This reverts commit a1eb750e75ff7c7ef7698deed4442449c33334c8. Bug: 28154455 Bug: 28694324 Change-Id: I8106bfba28da401b9fd38349c6a9fa9a24f54712
diff --git a/services/core/java/com/android/server/LockSettingsStorage.java b/services/core/java/com/android/server/LockSettingsStorage.java index 9ab6300..ab91a73 100644 --- a/services/core/java/com/android/server/LockSettingsStorage.java +++ b/services/core/java/com/android/server/LockSettingsStorage.java
@@ -74,7 +74,7 @@ private SparseArray<Integer> mStoredCredentialType; - class CredentialHash { + static class CredentialHash { static final int TYPE_NONE = -1; static final int TYPE_PATTERN = 1; static final int TYPE_PASSWORD = 2;