Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c41d574e authored by Hai Zhang's avatar Hai Zhang Committed by Automerger Merge Worker
Browse files

Merge "AppOpsService: Don't log stack traces for isolated processes" am: ffc64ac3 am: b34cf769 

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



Change-Id: I02e4a643423e3ab9feac0941374997ce21aa22c7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cc690abb b34cf769

services/core/java/com/android/server/appop/AppOpsService.java

+25 −5
Original line number Diff line number Diff line
@@ -2797,7 +2797,11 @@ public class AppOpsService extends IAppOpsService.Stub { 
        try {

            pvr = verifyAndGetBypass(uid, packageName, null);

        } catch (SecurityException 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);

        }
@@ -3972,7 +3984,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);

        }
@@ -4144,7 +4160,11 @@ public class AppOpsService extends IAppOpsService.Stub { 
                attributionTag = null;

            }

        } catch (SecurityException e) {

            if (Process.isIsolated(uid)) {

                Slog.e(TAG, "Cannot finishOperation: isolated process");

            } else {

                Slog.e(TAG, "Cannot finishOperation", e);

            }

            return;

        }