DO NOT MERGE. Block adoptable storage when using FBE.

am: 84be704af4

Change-Id: If12088f04915fb4e7c239a7d0d90aa945183611d
gugelfrei
Jeff Sharkey 8 years ago committed by android-build-merger
commit 1fbe38f424

@ -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::partitionPrivate() {
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;

Loading…
Cancel
Save