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

Merge "fix NullPointerException in RegisteredServicesCache" am: 4b1a8f46d6 am: 506bf0741a

Browse Source 
am: 5f4f8d2441

Change-Id: Iedcf57ee7856fb9abac459230e686a351370543d
This commit is contained in:
liulvping
2016-09-13 21:15:51 +00:00
committed by android-build-merger
parent 4502fa8f68 5f4f8d2441
commit 9eadea585c
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

@@ -390,15 +390,17 @@ public abstract class RegisteredServicesCache<V> {
@VisibleForTesting
protected boolean inSystemImage(int callerUid) {
String[] packages = mContext.getPackageManager().getPackagesForUid(callerUid);
for (String name : packages) {
try {
PackageInfo packageInfo =
mContext.getPackageManager().getPackageInfo(name, 0 /* flags */);
if ((packageInfo.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {
return true;
if (packages != null) {
for (String name : packages) {
try {
PackageInfo packageInfo =
mContext.getPackageManager().getPackageInfo(name, 0 /* flags */);
if ((packageInfo.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {
return true;
}
} catch (PackageManager.NameNotFoundException e) {
return false;
}
} catch (PackageManager.NameNotFoundException e) {
return false;
}
}
return false;