| commit | bdf85c224bf6361f81df14ab8a825a3512fecf5b | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Feb 24 10:03:53 2020 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Feb 24 10:03:53 2020 +0000 |
| tree | f99f5ff546f0f233d3d22dacc92d91cd7dabbcee | |
| parent | 05f5b8e7c4d3b1a12cddb14c7810b9a2d826a4d3 [diff] | |
| parent | c56ce8d647b35cb7b9bc9a502eb98fa96901e63b [diff] |
Merge "Guard NPE in getAvailabilityStatus of InstantAppDomainsPreferenceController" into rvc-dev
diff --git a/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceController.java b/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceController.java index cbb805f..34c67f1 100644 --- a/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceController.java
@@ -38,7 +38,8 @@ @Override public int getAvailabilityStatus() { - return AppUtils.isInstant(mParent.getPackageInfo().applicationInfo) + return mParent.getPackageInfo() != null + && AppUtils.isInstant(mParent.getPackageInfo().applicationInfo) ? AVAILABLE : DISABLED_FOR_USER; }