diff options
| author | Paul Lawrence <paullawrence@google.com> | 2014-05-28 07:14:17 -0700 |
|---|---|---|
| committer | Paul Lawrence <paullawrence@google.com> | 2014-05-29 16:03:43 +0000 |
| commit | fab7cbc9ced3d49df15b8c80cbf9b7fa7203e811 (patch) | |
| tree | 1f196fe166fd027e3f77fd21a2ce896fa574653a | |
| parent | f71205c1ee3b34801f98af275a281f7d06c50b51 (diff) | |
| download | frameworks_base-fab7cbc9ced3d49df15b8c80cbf9b7fa7203e811.zip frameworks_base-fab7cbc9ced3d49df15b8c80cbf9b7fa7203e811.tar.gz frameworks_base-fab7cbc9ced3d49df15b8c80cbf9b7fa7203e811.tar.bz2 | |
DO NOT MERGE: Hide crypto consts from docs
@bug 15192967
Change-Id: I134b2cb2d2841bc101e63a8a4dbd86f7b7bdca14
(cherry picked from commit 81ab14fb19a2669aa54c1a333c807c22d5c41a8e)
| -rw-r--r-- | api/current.txt | 4 | ||||
| -rw-r--r-- | core/java/android/os/storage/StorageManager.java | 28 |
2 files changed, 10 insertions, 22 deletions
diff --git a/api/current.txt b/api/current.txt index e2380f7..df908e0 100644 --- a/api/current.txt +++ b/api/current.txt @@ -21668,10 +21668,6 @@ 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 4963991..68b91cb 100644 --- a/core/java/android/os/storage/StorageManager.java +++ b/core/java/android/os/storage/StorageManager.java @@ -58,24 +58,6 @@ 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; @@ -663,4 +645,14 @@ 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; } |