From 9d08478274d9dae1ba101a6c486c2adb6eaa0cfd Mon Sep 17 00:00:00 2001 From: Ricky Wai Date: Thu, 13 Jan 2022 18:29:22 +0000 Subject: [PATCH] Do not throw exception if storage app data isolation is not enabled As the feature is not enabled yet, we should not throw exception and block all tests. We should show error message instead. Bug: 213442885 Test: atest android.os.storage.cts.StorageManagerTest#testCallback Change-Id: I9a46c9ed1aeb59d982ba3841943016bd7a357ac5 --- cmds/sm/src/com/android/commands/sm/Sm.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmds/sm/src/com/android/commands/sm/Sm.java b/cmds/sm/src/com/android/commands/sm/Sm.java index 260c8a47ea3c..b384e702ac4e 100644 --- a/cmds/sm/src/com/android/commands/sm/Sm.java +++ b/cmds/sm/src/com/android/commands/sm/Sm.java @@ -259,7 +259,8 @@ 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."); + System.err.println("Storage app data isolation is not enabled."); + return; } final String pkgName = nextArg(); final int pid = Integer.parseInt(nextArg());