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

Merge "Fixes NPE and adds @Nullable to PackageSetting.pkg" into rvc-dev am: 697c8e9546 am: 8558aeb6f8

Browse Source 
Change-Id: Ic2296a26da392053bfa79a6efce13c0708aa3e55
This commit is contained in:
Patrick Baumann
2020-04-02 15:57:12 +00:00
committed by Automerger Merge Worker
parent 6b8ee238d5 8558aeb6f8
commit 526d943c90
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/pm/AppsFilter.java
View File

@@ -674,7 +674,8 @@ public class AppsFilter {
Trace.endSection();
if (callingPkgSetting != null) {
if (!mFeatureConfig.packageIsEnabled(callingPkgSetting.pkg)) {
if (callingPkgSetting.pkg != null
&& !mFeatureConfig.packageIsEnabled(callingPkgSetting.pkg)) {
if (DEBUG_LOGGING) {
log(callingSetting, targetPkgSetting, "DISABLED");
}
@@ -682,7 +683,8 @@ public class AppsFilter {
}
} else {
for (int i = callingSharedPkgSettings.size() - 1; i >= 0; i--) {
if (!mFeatureConfig.packageIsEnabled(callingSharedPkgSettings.valueAt(i).pkg)) {
final AndroidPackage pkg = callingSharedPkgSettings.valueAt(i).pkg;
if (pkg != null && !mFeatureConfig.packageIsEnabled(pkg)) {
if (DEBUG_LOGGING) {
log(callingSetting, targetPkgSetting, "DISABLED");
}

1
services/core/java/com/android/server/pm/PackageSetting.java
View File

@@ -44,6 +44,7 @@ import java.util.Set;
public class PackageSetting extends PackageSettingBase {
int appId;
@Nullable
public AndroidPackage pkg;
/**
* WARNING. The object reference is important. We perform integer equality and NOT