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

Commit 2a519cce 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:... 

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

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



Change-Id: Iaea81b4b89ae82e9204d644e40ea23bd191de8cd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 13101fe9 c41d574e

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

+25 −5
Original line number Diff line number Diff line
@@ -1909,7 +1909,11 @@ public class AppOpsService extends IAppOpsService.Stub implements PersistenceSch 
        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;

        }
@@ -2322,7 +2326,11 @@ public class AppOpsService extends IAppOpsService.Stub implements PersistenceSch 
        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);

        }
@@ -2534,7 +2542,11 @@ public class AppOpsService extends IAppOpsService.Stub implements PersistenceSch 
                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);

        }
@@ -3055,7 +3067,11 @@ public class AppOpsService extends IAppOpsService.Stub implements PersistenceSch 
                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);

        }
@@ -3231,7 +3247,11 @@ public class AppOpsService extends IAppOpsService.Stub implements PersistenceSch 
                attributionTag = null;

            }

        } catch (SecurityException e) {

            if (Process.isIsolated(uid)) {

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

            } else {

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

            }

            return;

        }