commit 279cc3d65e9a72a48abaa3c15b91db2f842aeba7
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Wed Oct 10 10:26:04 2018 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Wed Oct 10 10:26:04 2018 +0000
tree 061017bb4203f3fb400fbba57174612b4138e2a8
parent 4de0e883d0da7c9a7e00d169038758afd26ef66f
parent 08bd47e9a9c0bb004ccaf7173b1dee2914b9e3e3

[automerger] [DO NOT MERGE] Fix signedness mismatch and integer underflow am: ef35553d53 am: 08bd47e9a9

Change-Id: Ie536c5dd8c447cd3753725040edbec7ce478ea07

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;