Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a2f3dd8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE if CarrierConfigManager is not available" into rvc-dev

parents 2b42301a e6fae381

src/com/android/settings/network/telephony/ContactDiscoveryPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

    }