Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "fix NullPointerException in RegisteredServicesCache"

Browse Source 
am: 4b1a8f46d6

Change-Id: I1ba9512647d515aedbaf09eb2d7ac524477e5296
This commit is contained in:
liulvping
2016-09-13 21:04:55 +00:00
committed by android-build-merger
parent 04829c4ddd 4b1a8f46d6
commit 506bf0741a
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/content/pm/RegisteredServicesCache.java
View File

@@ -347,6 +347,7 @@ public abstract class RegisteredServicesCache<V> {
@VisibleForTesting @VisibleForTesting
protected boolean inSystemImage(int callerUid) { protected boolean inSystemImage(int callerUid) {
String[] packages = mContext.getPackageManager().getPackagesForUid(callerUid); String[] packages = mContext.getPackageManager().getPackagesForUid(callerUid);
if (packages != null) {
for (String name : packages) { for (String name : packages) {
try { try {
PackageInfo packageInfo = PackageInfo packageInfo =
@@ -358,6 +359,7 @@ public abstract class RegisteredServicesCache<V> {
return false; return false;
} }
} }
}
return false; return false;
} }