summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--services/core/java/com/android/server/appop/AppOpsService.java30
1 files changed, 25 insertions, 5 deletions
diff --git a/services/core/java/com/android/server/appop/AppOpsService.java b/services/core/java/com/android/server/appop/AppOpsService.java
index 430186ad4707..65030294a351 100644
--- a/services/core/java/com/android/server/appop/AppOpsService.java
+++ b/services/core/java/com/android/server/appop/AppOpsService.java
@@ -2797,7 +2797,11 @@ public class AppOpsService extends IAppOpsService.Stub {
try {
pvr = verifyAndGetBypass(uid, packageName, null);
} catch (SecurityException e) {
- Slog.e(TAG, "Cannot setMode", e);
+ if (Process.isIsolated(uid)) {
+ Slog.e(TAG, "Cannot setMode: isolated process");
+ } else {
+ Slog.e(TAG, "Cannot setMode", e);
+ }
return;
}
@@ -3252,7 +3256,11 @@ public class AppOpsService extends IAppOpsService.Stub {
try {
pvr = verifyAndGetBypass(uid, packageName, null);
} catch (SecurityException e) {
- Slog.e(TAG, "checkOperation", e);
+ if (Process.isIsolated(uid)) {
+ Slog.e(TAG, "Cannot checkOperation: isolated process");
+ } else {
+ Slog.e(TAG, "Cannot checkOperation", e);
+ }
return AppOpsManager.opToDefaultMode(code);
}
@@ -3458,7 +3466,11 @@ public class AppOpsService extends IAppOpsService.Stub {
attributionTag = null;
}
} catch (SecurityException e) {
- Slog.e(TAG, "noteOperation", e);
+ if (Process.isIsolated(uid)) {
+ Slog.e(TAG, "Cannot noteOperation: isolated process");
+ } else {
+ Slog.e(TAG, "Cannot noteOperation", e);
+ }
return new SyncNotedAppOp(AppOpsManager.MODE_ERRORED, code, attributionTag,
packageName);
}
@@ -3974,7 +3986,11 @@ public class AppOpsService extends IAppOpsService.Stub {
attributionTag = null;
}
} catch (SecurityException e) {
- Slog.e(TAG, "startOperation", e);
+ if (Process.isIsolated(uid)) {
+ Slog.e(TAG, "Cannot startOperation: isolated process");
+ } else {
+ Slog.e(TAG, "Cannot startOperation", e);
+ }
return new SyncNotedAppOp(AppOpsManager.MODE_ERRORED, code, attributionTag,
packageName);
}
@@ -4148,7 +4164,11 @@ public class AppOpsService extends IAppOpsService.Stub {
attributionTag = null;
}
} catch (SecurityException e) {
- Slog.e(TAG, "Cannot finishOperation", e);
+ if (Process.isIsolated(uid)) {
+ Slog.e(TAG, "Cannot finishOperation: isolated process");
+ } else {
+ Slog.e(TAG, "Cannot finishOperation", e);
+ }
return;
}