[automerge] Fix printing duplicate logs to save on battery 2p: efdf00bff9 2p: 70916e87f9

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

Bug: 202092164
Change-Id: I56243e9400b3b244489b24ab6cde09c6e3b6243f
This commit is contained in:
Presubmit Automerger Backend
2022-03-26 12:06:34 +00:00

View File

@@ -1486,6 +1486,10 @@ public final class PermissionManager {
}
}
// Only warn once for assuming that root or system UID has a permission
// to reduce duplicate logcat output.
private static volatile boolean sShouldWarnMissingActivityManager = true;
/* @hide */
private static int checkPermissionUncached(@Nullable String permission, int pid, int uid) {
final IActivityManager am = ActivityManager.getService();
@@ -1495,8 +1499,11 @@ public final class PermissionManager {
// permission this is.
final int appId = UserHandle.getAppId(uid);
if (appId == Process.ROOT_UID || appId == Process.SYSTEM_UID) {
Slog.w(LOG_TAG, "Missing ActivityManager; assuming " + uid + " holds "
+ permission);
if (sShouldWarnMissingActivityManager) {
Slog.w(LOG_TAG, "Missing ActivityManager; assuming " + uid + " holds "
+ permission);
sShouldWarnMissingActivityManager = false;
}
return PackageManager.PERMISSION_GRANTED;
}
Slog.w(LOG_TAG, "Missing ActivityManager; assuming " + uid + " does not hold "
@@ -1504,6 +1511,7 @@ public final class PermissionManager {
return PackageManager.PERMISSION_DENIED;
}
try {
sShouldWarnMissingActivityManager = true;
return am.checkPermission(permission, pid, uid);
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();