Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Return error in "sm unmount-app-data-dirs" if app data isolation is not enabled" am: 4d53e3b9bc

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556237

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If03f03feb9f89a15fa5ca0e6145fbe87a5a150a1
This commit is contained in:
rickywai
2021-01-22 14:56:57 +00:00
committed by Automerger Merge Worker
parent e8a98db615 4d53e3b9bc
commit 361fd37803
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cmds/sm/src/com/android/commands/sm/Sm.java
View File

@@ -20,6 +20,7 @@ import android.os.IVoldTaskListener;
import android.os.PersistableBundle; import android.os.PersistableBundle;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.ServiceManager; import android.os.ServiceManager;
import android.os.SystemProperties;
import android.os.storage.DiskInfo; import android.os.storage.DiskInfo;
import android.os.storage.IStorageManager; import android.os.storage.IStorageManager;
import android.os.storage.StorageManager; import android.os.storage.StorageManager;
@@ -30,6 +31,8 @@ import java.util.concurrent.CompletableFuture;
public final class Sm { public final class Sm {
private static final String TAG = "Sm"; private static final String TAG = "Sm";
private static final String ANDROID_VOLD_APP_DATA_ISOLATION_ENABLED_PROPERTY =
"persist.sys.vold_app_data_isolation_enabled";
IStorageManager mSm; IStorageManager mSm;
@@ -256,6 +259,10 @@ public final class Sm {
} }
public void runDisableAppDataIsolation() throws RemoteException { public void runDisableAppDataIsolation() throws RemoteException {
if (!SystemProperties.getBoolean(
ANDROID_VOLD_APP_DATA_ISOLATION_ENABLED_PROPERTY, false)) {
throw new IllegalStateException("Storage app data isolation is not enabled.");
}
final String pkgName = nextArg(); final String pkgName = nextArg();
final int pid = Integer.parseInt(nextArg()); final int pid = Integer.parseInt(nextArg());
final int userId = Integer.parseInt(nextArg()); final int userId = Integer.parseInt(nextArg());