commit 2bc68575325ab7bf082de24f5f095f20ea63f877
author Paul Lawrence <paullawrence@google.com> Mon Mar 10 16:41:21 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 10 16:41:22 2014 +0000
tree d989307abd4afc3e8749309ca2dce248be22d75f
parent eb7bd8bbc3f2c1bb383e394fa255e5b86e03f1bd
parent 0a18029075fbe5e5da396c66ef26cfa7e7f1a082

Merge "Clean up a few minor issues"

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 921bd5f..9d87336 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -19382,6 +19382,10 @@
     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
   }
 
 }

core/java/android/os/storage/StorageManager.java

diff --git a/core/java/android/os/storage/StorageManager.java b/core/java/android/os/storage/StorageManager.java
index 68b91cb..4963991 100644
--- a/core/java/android/os/storage/StorageManager.java
+++ b/core/java/android/os/storage/StorageManager.java
@@ -58,6 +58,24 @@
  * 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 @@
         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;
 }

core/java/com/android/internal/widget/LockPatternUtils.java

diff --git a/core/java/com/android/internal/widget/LockPatternUtils.java b/core/java/com/android/internal/widget/LockPatternUtils.java
index f5c18f5..2d79491 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.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;

services/core/java/com/android/server/MountService.java

diff --git a/services/core/java/com/android/server/MountService.java b/services/core/java/com/android/server/MountService.java
index a7ef424..cd74fed 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.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;