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

Merge "fix NullPointerException in RegisteredServicesCache" am: 4b1a8f46d6

Browse Source 
am: 506bf0741a

Change-Id: I0ec538fc78a512441517d1205ac3d34232ce992e
This commit is contained in:
liulvping
2016-09-13 21:10:22 +00:00
committed by android-build-merger
parent 5a8af8f252 506bf0741a
commit 5f4f8d2441
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -347,15 +347,17 @@ 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);
for (String name : packages) { if (packages != null) {
try { for (String name : packages) {
PackageInfo packageInfo = try {
mContext.getPackageManager().getPackageInfo(name, 0 /* flags */); PackageInfo packageInfo =
if ((packageInfo.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0) { mContext.getPackageManager().getPackageInfo(name, 0 /* flags */);
return true; if ((packageInfo.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {
return true;
}
} catch (PackageManager.NameNotFoundException e) {
return false;
} }
} catch (PackageManager.NameNotFoundException e) {
return false;
} }
} }
return false; return false;