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

Commit fc416491 authored by Allen Su's avatar Allen Su Committed by Automerger Merge Worker
Browse files

Merge "Change carrier config" am: ba383826 am: 3d9ede18 am: 034b2236 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1512649

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I88fcda205e510641bc718d25b7f580e1c2d18648
parents 27138417 034b2236

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

+5 −2
Original line number Diff line number Diff line
@@ -98,8 +98,11 @@ public class ContactDiscoveryPreferenceController extends TelephonyTogglePrefere 
    @Override

    public int getAvailabilityStatus(int subId) {

        PersistableBundle bundle = mCarrierConfigManager.getConfigForSubId(subId);

        boolean shouldShowPresence = bundle != null && bundle.getBoolean(

                CarrierConfigManager.KEY_USE_RCS_PRESENCE_BOOL, false /*default*/);

        boolean shouldShowPresence = bundle != null

                && (bundle.getBoolean(

                CarrierConfigManager.KEY_USE_RCS_PRESENCE_BOOL, false /*default*/)

                || bundle.getBoolean(

                CarrierConfigManager.Ims.KEY_RCS_BULK_CAPABILITY_EXCHANGE_BOOL, false /*default*/));

        return shouldShowPresence ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;

    }

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

+4 −1
Original line number Diff line number Diff line
@@ -204,7 +204,10 @@ public class MobileNetworkUtils { 
            return false;

        }

        PersistableBundle bundle = carrierConfigManager.getConfigForSubId(subId);

        return bundle.getBoolean(CarrierConfigManager.KEY_USE_RCS_PRESENCE_BOOL, false /*default*/);

        return bundle.getBoolean(

                CarrierConfigManager.KEY_USE_RCS_PRESENCE_BOOL, false /*default*/)

                || bundle.getBoolean(CarrierConfigManager.Ims.KEY_RCS_BULK_CAPABILITY_EXCHANGE_BOOL,

                false /*default*/);

    }



    public static Intent buildPhoneAccountConfigureIntent(

tests/robotests/src/com/android/settings/network/telephony/ContactDiscoveryPreferenceControllerTest.java

+3 −1
Original line number Diff line number Diff line
@@ -159,7 +159,9 @@ public class ContactDiscoveryPreferenceControllerTest { 
    }



    private void setRcsPresenceConfig(boolean isEnabled) {

        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_USE_RCS_PRESENCE_BOOL, isEnabled);

        mCarrierConfig.putBoolean(

                CarrierConfigManager.Ims.KEY_RCS_BULK_CAPABILITY_EXCHANGE_BOOL,

                isEnabled);

    }



    private ContentObserver getUceChangeObserver() {