diff options
| author | Elliott Hughes <enh@google.com> | 2014-09-26 12:30:47 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2014-09-26 15:18:20 -0700 |
| commit | f839b4fcb6b179529585765517895a8c90fe315b (patch) | |
| tree | 406660ee666f40dd9bda2ace4107fab9bd4d8d24 /core/java | |
| parent | 6b0a880e13b217b670f27bfe8ef3a13b3bb51af0 (diff) | |
| download | frameworks_base-f839b4fcb6b179529585765517895a8c90fe315b.zip frameworks_base-f839b4fcb6b179529585765517895a8c90fe315b.tar.gz frameworks_base-f839b4fcb6b179529585765517895a8c90fe315b.tar.bz2 | |
Set the system locale correctly even on an encrypted device.
Bug: 17659622
Change-Id: Ibbbd5b959bfab5345f20b556c4720d0910b50084
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/os/storage/StorageManager.java | 8 | ||||
| -rw-r--r-- | core/java/com/android/internal/widget/LockPatternUtils.java | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/core/java/android/os/storage/StorageManager.java b/core/java/android/os/storage/StorageManager.java index 4cdafe1..2785ee8 100644 --- a/core/java/android/os/storage/StorageManager.java +++ b/core/java/android/os/storage/StorageManager.java @@ -665,4 +665,12 @@ public class StorageManager { public static final int CRYPT_TYPE_PATTERN = 2; /** @hide */ public static final int CRYPT_TYPE_PIN = 3; + + // Constants for the data available via MountService.getField. + /** @hide */ + public static final String SYSTEM_LOCALE_KEY = "SystemLocale"; + /** @hide */ + public static final String OWNER_INFO_KEY = "OwnerInfo"; + /** @hide */ + public static final String PATTERN_VISIBLE_KEY = "PatternVisible"; } diff --git a/core/java/com/android/internal/widget/LockPatternUtils.java b/core/java/com/android/internal/widget/LockPatternUtils.java index 85b58aa..16fa88e 100644 --- a/core/java/com/android/internal/widget/LockPatternUtils.java +++ b/core/java/com/android/internal/widget/LockPatternUtils.java @@ -604,7 +604,7 @@ public class LockPatternUtils { IMountService mountService = IMountService.Stub.asInterface(service); try { Log.d(TAG, "Setting owner info"); - mountService.setField("OwnerInfo", ownerInfo); + mountService.setField(StorageManager.OWNER_INFO_KEY, ownerInfo); } catch (RemoteException e) { Log.e(TAG, "Error changing user info", e); } @@ -1144,7 +1144,7 @@ public class LockPatternUtils { IMountService mountService = IMountService.Stub.asInterface(service); try { - mountService.setField("PatternVisible", enabled ? "1" : "0"); + mountService.setField(StorageManager.PATTERN_VISIBLE_KEY, enabled ? "1" : "0"); } catch (RemoteException e) { Log.e(TAG, "Error changing pattern visible state", e); } |