tequilaOS/platform_system_vold
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

DO NOT MERGE. Block adoptable storage when using FBE.

Browse source 
am: 84be704af4

Change-Id: If12088f04915fb4e7c239a7d0d90aa945183611d
This commit is contained in:
Jeff Sharkey 2016-08-31 23:35:13 +00:00 committed by android-build-merger
commit 1fbe38f424
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Disk.cpp
View file

@ -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;