diff options
| author | 2020-04-02 15:16:42 +0000 | |
|---|---|---|
| committer | 2020-04-02 15:16:42 +0000 | |
| commit | 697c8e954627a761919dbeef1643edb98ccccd5c (patch) | |
| tree | 88ef8540abe207356591c0f89c30f672ce9da13b | |
| parent | 904021d71fe1a30d652ac601218bd1bf50c08cf4 (diff) | |
| parent | 74860927b9cc2e847efe2097e244155f15796d6b (diff) | |
Merge "Fixes NPE and adds @Nullable to PackageSetting.pkg" into rvc-dev
| -rw-r--r-- | services/core/java/com/android/server/pm/AppsFilter.java | 6 | ||||
| -rw-r--r-- | services/core/java/com/android/server/pm/PackageSetting.java | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/pm/AppsFilter.java b/services/core/java/com/android/server/pm/AppsFilter.java index 805d91852d8e..09b782d768d2 100644 --- a/services/core/java/com/android/server/pm/AppsFilter.java +++ b/services/core/java/com/android/server/pm/AppsFilter.java @@ -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"); } diff --git a/services/core/java/com/android/server/pm/PackageSetting.java b/services/core/java/com/android/server/pm/PackageSetting.java index 8eb391454df8..432d7f335ebc 100644 --- a/services/core/java/com/android/server/pm/PackageSetting.java +++ b/services/core/java/com/android/server/pm/PackageSetting.java @@ -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 |