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

Commit d01838d8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix NPE if CarrierConfigManager is not available"

parents 32ca9b27 525a07ec

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;

    }