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

Fix NPE if CarrierConfigManager is not available

Browse Source 
Fixes: 155147094
Fixes: 155819375
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.network.telephony
Change-Id: Iecf3e385a88d18c7578eb520449f4042324e21f5
Merged-In: Iecf3e385a88d18c7578eb520449f4042324e21f5
This commit is contained in:
Brad Ebinger
2020-04-28 11:19:10 -07:00
parent 32ca9b270d
commit 525a07ec7f
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 @Override
public int getAvailabilityStatus(int subId) { public int getAvailabilityStatus(int subId) {
PersistableBundle bundle = mCarrierConfigManager.getConfigForSubId(subId); PersistableBundle bundle = mCarrierConfigManager.getConfigForSubId(subId);
boolean shouldShowPresence = bundle.getBoolean( boolean shouldShowPresence = bundle != null && bundle.getBoolean(
CarrierConfigManager.KEY_USE_RCS_PRESENCE_BOOL, false /*default*/); CarrierConfigManager.KEY_USE_RCS_PRESENCE_BOOL, false /*default*/);
return shouldShowPresence ? AVAILABLE : CONDITIONALLY_UNAVAILABLE; return shouldShowPresence ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
} }