diff --git a/src/com/android/settings/network/telephony/ContactDiscoveryPreferenceController.java b/src/com/android/settings/network/telephony/ContactDiscoveryPreferenceController.java index 6eebe6b298e..eead41fe5cc 100644 --- a/src/com/android/settings/network/telephony/ContactDiscoveryPreferenceController.java +++ b/src/com/android/settings/network/telephony/ContactDiscoveryPreferenceController.java @@ -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; } diff --git a/src/com/android/settings/network/telephony/MobileNetworkUtils.java b/src/com/android/settings/network/telephony/MobileNetworkUtils.java index 99e69c70f8a..c61c2229c82 100644 --- a/src/com/android/settings/network/telephony/MobileNetworkUtils.java +++ b/src/com/android/settings/network/telephony/MobileNetworkUtils.java @@ -199,7 +199,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*/); } @VisibleForTesting diff --git a/tests/robotests/src/com/android/settings/network/telephony/ContactDiscoveryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/ContactDiscoveryPreferenceControllerTest.java index 3d54cfbae03..fd5ed37bf64 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/ContactDiscoveryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/ContactDiscoveryPreferenceControllerTest.java @@ -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() {