am a52a95f4: am 8f4ccd6c: Merge "Reduce log noise." into mnc-dev

* commit 'a52a95f405d7df90bd83798c39c8ca1969400e4e':
  Reduce log noise.
This commit is contained in:
Wale Ogunwale
2015-06-19 16:59:17 +00:00
committed by Android Git Automerger

View File

@@ -8270,7 +8270,7 @@ public final class ActivityManagerService extends ActivityManagerNative
try {
if (AppGlobals.getPackageManager().isUidPrivileged(callingUid)) {
allowed = true;
Slog.w(TAG, caller + ": caller " + callingUid
if (DEBUG_TASKS) Slog.w(TAG, caller + ": caller " + callingUid
+ " is using old GET_TASKS but privileged; allowing");
}
} catch (RemoteException e) {
@@ -8278,7 +8278,7 @@ public final class ActivityManagerService extends ActivityManagerNative
}
}
if (!allowed) {
Slog.w(TAG, caller + ": caller " + callingUid
if (DEBUG_TASKS) Slog.w(TAG, caller + ": caller " + callingUid
+ " does not hold REAL_GET_TASKS; limiting output");
}
return allowed;