| commit | 6ea2228e311a012336ddb9e320f8766e9a1fc4e2 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed May 27 01:52:00 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed May 27 01:52:00 2020 +0000 |
| tree | d0b29a4462a61b083ed91d2eff9bd586fbc28806 | |
| parent | 9cfbb7fba3781fa649a2daa270da3d646340f719 [diff] | |
| parent | d01838d8cea0388df3d922d32c4997d60dc88848 [diff] |
Merge "Fix NPE if CarrierConfigManager is not available" am: d01838d8ce Change-Id: I5ff6cfcf79cfeec14571ae4f34ea74fd658025d3
diff --git a/src/com/android/settings/network/telephony/ContactDiscoveryPreferenceController.java b/src/com/android/settings/network/telephony/ContactDiscoveryPreferenceController.java index 880c444..6eebe6b 100644 --- a/src/com/android/settings/network/telephony/ContactDiscoveryPreferenceController.java +++ b/src/com/android/settings/network/telephony/ContactDiscoveryPreferenceController.java
@@ -98,7 +98,7 @@ @Override public int getAvailabilityStatus(int subId) { PersistableBundle bundle = mCarrierConfigManager.getConfigForSubId(subId); - boolean shouldShowPresence = bundle.getBoolean( + boolean shouldShowPresence = bundle != null && bundle.getBoolean( CarrierConfigManager.KEY_USE_RCS_PRESENCE_BOOL, false /*default*/); return shouldShowPresence ? AVAILABLE : CONDITIONALLY_UNAVAILABLE; }