| commit | d01838d8cea0388df3d922d32c4997d60dc88848 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed May 27 01:36:46 2020 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed May 27 01:36:46 2020 +0000 |
| tree | a12d71d7b96c8d13e37fb164cc518048c9f125f3 | |
| parent | 32ca9b270d9aa11504defcd0711b39ac58a8dbc1 [diff] | |
| parent | 525a07ec7ff5a68c1269b490179e12f30c082732 [diff] |
Merge "Fix NPE if CarrierConfigManager is not available"
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; }