PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix NPE if CarrierConfigManager is not available" am: d01838d8ce

Browse Source 
Change-Id: I5ff6cfcf79cfeec14571ae4f34ea74fd658025d3
This commit is contained in:
Treehugger Robot
2020-05-27 01:52:00 +00:00
committed by Automerger Merge Worker
parent 9cfbb7fba3 d01838d8ce
commit 6ea2228e31
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/network/telephony/ContactDiscoveryPreferenceController.java
View File

@@ -98,7 +98,7 @@ public class ContactDiscoveryPreferenceController extends TelephonyTogglePrefere
@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;
}