Merge "Fix NPE if CarrierConfigManager is not available" into rvc-dev am: 7a2f3dd8a7
am: f2df3a44d6
am: 88271f0273
Change-Id: I85b094ed76eb5c0e39712b833c84c7359cf915c4
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
Reference in New Issue
Block a user