diff options
| author | 2016-04-07 16:32:00 +0000 | |
|---|---|---|
| committer | 2016-04-07 16:32:01 +0000 | |
| commit | 76cda85895b7b18b7e13d1cc02c665a15b9cc2b4 (patch) | |
| tree | b4838a03acd14d5c07ae7854b67f85ff7c9fcbad | |
| parent | 6e6c64702e8a084d32bbb9804c26f74e47d63fb6 (diff) | |
| parent | 819c2f8fdac9fd16f03f43f8c002c9cd68d9888d (diff) | |
Merge "Fix a NPE" into nyc-dev
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityManagerService.java | 10 |
1 files 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 158751630ee0..4852788af3d1 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); } |