diff options
| -rw-r--r-- | api/current.txt | 4 | ||||
| -rw-r--r-- | core/java/android/os/storage/StorageManager.java | 28 | ||||
| -rw-r--r-- | core/java/com/android/internal/widget/LockPatternUtils.java | 1 | ||||
| -rw-r--r-- | services/core/java/com/android/server/MountService.java | 1 |
4 files changed, 22 insertions, 12 deletions
diff --git a/api/current.txt b/api/current.txt index 921bd5f64312..9d873369613b 100644 --- a/api/current.txt +++ b/api/current.txt @@ -19382,6 +19382,10 @@ package android.os.storage { method public boolean isObbMounted(java.lang.String); method public boolean mountObb(java.lang.String, java.lang.String, android.os.storage.OnObbStateChangeListener); method public boolean unmountObb(java.lang.String, boolean, android.os.storage.OnObbStateChangeListener); + field public static final int CRYPT_TYPE_DEFAULT = 1; // 0x1 + field public static final int CRYPT_TYPE_PASSWORD = 0; // 0x0 + field public static final int CRYPT_TYPE_PATTERN = 2; // 0x2 + field public static final int CRYPT_TYPE_PIN = 3; // 0x3 } } diff --git a/core/java/android/os/storage/StorageManager.java b/core/java/android/os/storage/StorageManager.java index 68b91cb7dfdf..496399113754 100644 --- a/core/java/android/os/storage/StorageManager.java +++ b/core/java/android/os/storage/StorageManager.java @@ -58,6 +58,24 @@ import java.util.concurrent.atomic.AtomicInteger; * argument of {@link android.content.Context#STORAGE_SERVICE}. */ public class StorageManager { + + /// Consts to match the password types in cryptfs.h + /** Master key is encrypted with a password. + */ + public static final int CRYPT_TYPE_PASSWORD = 0; + + /** Master key is encrypted with the default password. + */ + public static final int CRYPT_TYPE_DEFAULT = 1; + + /** Master key is encrypted with a pattern. + */ + public static final int CRYPT_TYPE_PATTERN = 2; + + /** Master key is encrypted with a pin. + */ + public static final int CRYPT_TYPE_PIN = 3; + private static final String TAG = "StorageManager"; private final ContentResolver mResolver; @@ -645,14 +663,4 @@ public class StorageManager { return Settings.Global.getLong(mResolver, Settings.Global.SYS_STORAGE_FULL_THRESHOLD_BYTES, DEFAULT_FULL_THRESHOLD_BYTES); } - - /// Consts to match the password types in cryptfs.h - /** @hide */ - public static final int CRYPT_TYPE_PASSWORD = 0; - /** @hide */ - public static final int CRYPT_TYPE_DEFAULT = 1; - /** @hide */ - public static final int CRYPT_TYPE_PATTERN = 2; - /** @hide */ - public static final int CRYPT_TYPE_PIN = 3; } diff --git a/core/java/com/android/internal/widget/LockPatternUtils.java b/core/java/com/android/internal/widget/LockPatternUtils.java index f5c18f5304b4..2d7949140ca1 100644 --- a/core/java/com/android/internal/widget/LockPatternUtils.java +++ b/core/java/com/android/internal/widget/LockPatternUtils.java @@ -35,7 +35,6 @@ import android.provider.Settings; import android.telephony.TelephonyManager; import android.text.TextUtils; import android.util.Log; -import android.util.Slog; import android.view.IWindowManager; import android.view.View; import android.widget.Button; diff --git a/services/core/java/com/android/server/MountService.java b/services/core/java/com/android/server/MountService.java index a7ef42423bcf..cd74fed4d1b3 100644 --- a/services/core/java/com/android/server/MountService.java +++ b/services/core/java/com/android/server/MountService.java @@ -80,7 +80,6 @@ import java.io.File; import java.io.FileDescriptor; import java.io.IOException; import java.io.PrintWriter; -import java.io.UnsupportedEncodingException; import java.math.BigInteger; import java.nio.charset.StandardCharsets; import java.security.NoSuchAlgorithmException; |