commit 4de0e883d0da7c9a7e00d169038758afd26ef66f
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Fri Jun 01 21:46:09 2018 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Fri Jun 01 21:46:09 2018 +0000
tree 6b8403bf29bda37dc6d0942072b5cba1dfb45a17
parent 84c985e27520d0341ce6633d022e8a31266e0db5
parent 5716ee6d7a544bc7da19b6aae2b17f7da40d8ffc

[automerger] Require quotes when searching for blkid keys. am: ee5c7318d7 am: 98bb129cd3 am: 0c5a0d65c9 am: 7e51f8d0c4 am: 53fe89bbad am: 5716ee6d7a

Change-Id: Icf5c0c0a0c4f4aec605182111dcedf16f5a4ab95

CommandListener.cpp

diff --git a/CommandListener.cpp b/CommandListener.cpp
index 8780e98..b548a91 100644
--- a/CommandListener.cpp
+++ b/CommandListener.cpp
@@ -300,7 +300,7 @@
             cli->sendMsg(ResponseCode::CommandSyntaxError, "Usage: mountall", false);
             return 0;
         }
-        fs_mgr_mount_all(fstab);
+        fs_mgr_mount_all(fstab, MOUNT_MODE_DEFAULT);
         cli->sendMsg(ResponseCode::CommandOkay, "Mountall ran successfully", false);
         return 0;
     }

Disk.cpp

diff --git a/Disk.cpp b/Disk.cpp
index 2c2a2da..1e1a63e 100644
--- a/Disk.cpp
+++ b/Disk.cpp
@@ -21,6 +21,7 @@
 #include "VolumeBase.h"
 #include "VolumeManager.h"
 #include "ResponseCode.h"
+#include "Ext4Crypt.h"
 
 #include <android-base/file.h>
 #include <android-base/stringprintf.h>
@@ -438,6 +439,11 @@
 status_t Disk::partitionMixed(int8_t ratio) {
     int res;
 
+    if (e4crypt_is_native()) {
+        LOG(ERROR) << "Private volumes not yet supported on FBE devices";
+        return -EINVAL;
+    }
+
     destroyAllVolumes();
     mJustPartitioned = true;