| commit | c56ce8d647b35cb7b9bc9a502eb98fa96901e63b | [log] [tgz] |
|---|---|---|
| author | Jason Chiu <chiujason@google.com> | Fri Feb 21 17:06:03 2020 +0800 |
| committer | Jason Chiu <chiujason@google.com> | Mon Feb 24 06:19:11 2020 +0000 |
| tree | ed87eb62d2054af7fce9cdb30348ae755f1b3f12 | |
| parent | 34fdec266890d5c48b2fedb783a8de152e2eefdb [diff] |
Guard NPE in getAvailabilityStatus of InstantAppDomainsPreferenceController Fixes: 149373695 Test: build, manual Change-Id: I7501ef393e226bb38c72a1ee465bf9c72586716b Merged-In: I7501ef393e226bb38c72a1ee465bf9c72586716b (cherry picked from commit c0543e833f4dd0ef0165d7b490e68fba73df097c)
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; }