Skip to content
Snippets Groups Projects
Commit 2007b056 authored by Ricky Wai's avatar Ricky Wai Committed by rickywai
Browse files

Return error in "sm unmount-app-data-dirs" if app data isolation is not enabled

This command should not do anything when feature flag is off,
and let developer knows this command fails.

Bug: 177228735
Test: run "sm unmount-app-data-dirs" when the app data isolation flag is off and returns error message
Change-Id: If07107712e8215a58ffade08aedce3e80ad1ac12
parent c74d6f31
No related branches found
No related tags found
No related merge requests found
......@@ -20,6 +20,7 @@ import android.os.IVoldTaskListener;
import android.os.PersistableBundle;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.os.SystemProperties;
import android.os.storage.DiskInfo;
import android.os.storage.IStorageManager;
import android.os.storage.StorageManager;
......@@ -30,6 +31,8 @@ import java.util.concurrent.CompletableFuture;
public final class 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;
......@@ -256,6 +259,10 @@ public final class Sm {
}
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 int pid = Integer.parseInt(nextArg());
final int userId = Integer.parseInt(nextArg());
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment