From 819c2f8fdac9fd16f03f43f8c002c9cd68d9888d Mon Sep 17 00:00:00 2001 From: Svet Ganov Date: Thu, 7 Apr 2016 09:27:58 -0700 Subject: [PATCH] Fix a NPE bug:27999133 Change-Id: Icacb8f440bca2f720c15ee5548495fad50502fa0 --- .../java/com/android/server/am/ActivityManagerService.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index ef0577327596..82332208a3cd 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -10590,14 +10590,14 @@ public final class ActivityManagerService extends ActivityManagerNative private boolean requestTargetProviderPermissionsReviewIfNeededLocked(ProviderInfo cpi, ProcessRecord r, final int userId) { if (getPackageManagerInternalLocked().isPermissionsReviewRequired( - cpi.packageName, r.userId)) { + cpi.packageName, userId)) { - final boolean callerForeground = r != null ? r.setSchedGroup - != ProcessList.SCHED_GROUP_BACKGROUND : true; + final boolean callerForeground = r == null || r.setSchedGroup + != ProcessList.SCHED_GROUP_BACKGROUND; // Show a permission review UI only for starting from a foreground app if (!callerForeground) { - Slog.w(TAG, "u" + r.userId + " Instantiating a provider in package" + Slog.w(TAG, "u" + userId + " Instantiating a provider in package" + cpi.packageName + " requires a permissions review"); return false; } @@ -10608,7 +10608,7 @@ public final class ActivityManagerService extends ActivityManagerNative intent.putExtra(Intent.EXTRA_PACKAGE_NAME, cpi.packageName); if (DEBUG_PERMISSIONS_REVIEW) { - Slog.i(TAG, "u" + r.userId + " Launching permission review " + Slog.i(TAG, "u" + userId + " Launching permission review " + "for package " + cpi.packageName); } -- 2.11.0