commit 732def209c157ca1a186ec5b27b05fe1f282ca9d
author Treehugger Robot <treehugger-gerrit@google.com> Mon Aug 13 20:54:13 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Aug 13 20:54:13 2018 +0000
tree bad807c7d41657d34121417efc5ee747c624e484
parent 92f5db4a06dc4a0ee287e21dc7501a834343a278
parent c0eea5736e40eb26a2f88014f73929d84ea7c6b6

Merge "vold: Grant root group"

binder/android/os/IVold.aidl

diff --git a/binder/android/os/IVold.aidl b/binder/android/os/IVold.aidl
index 8300a8e..f386889 100644
--- a/binder/android/os/IVold.aidl
+++ b/binder/android/os/IVold.aidl
@@ -113,8 +113,8 @@
 
     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;

cryptfs.cpp

diff --git a/cryptfs.cpp b/cryptfs.cpp
index 16c589e..c4274ed 100644
--- a/cryptfs.cpp
+++ b/cryptfs.cpp
@@ -322,10 +322,6 @@
 
 constexpr CryptoType supported_crypto_types[] = {
     default_crypto_type,
-    CryptoType()
-        .set_property_name("Speck128/128-XTS")
-        .set_crypto_name("speck128-xts-plain64")
-        .set_keysize(32),
     // Add new CryptoTypes here.  Order is not important.
 };