Merge "Switch pattern/PIN constants to match values in cryptfs.h" am: 92f5db4a06 am: 6d418929f0 am: a2c5a6b3c2

am: f92ea9c4ef

Change-Id: I5ce921cb9c1ca0f27424ceb84e49793bb2c81d5d

binder/android/os/IVold.aidl

@@ -116,8 +116,8 @@ interface IVold {
 
     const int PASSWORD_TYPE_PASSWORD = 0;
     const int PASSWORD_TYPE_DEFAULT = 1;
-    const int PASSWORD_TYPE_PIN = 2;
-    const int PASSWORD_TYPE_PATTERN = 3;
+    const int PASSWORD_TYPE_PATTERN = 2;
+    const int PASSWORD_TYPE_PIN = 3;
 
     const int STORAGE_FLAG_DE = 1;
     const int STORAGE_FLAG_CE = 2;