PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Change carrier config" am: ba38382627 am: 3d9ede1815 am: 034b2236dd

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I88fcda205e510641bc718d25b7f580e1c2d18648
This commit is contained in:
Allen Su
2020-12-22 07:16:06 +00:00
committed by Automerger Merge Worker
parent 271384174f 034b2236dd
commit fc41649147
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/network/telephony/ContactDiscoveryPreferenceController.java
View File

@@ -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;
}

5
src/com/android/settings/network/telephony/MobileNetworkUtils.java
View File

@@ -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(

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

@@ -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() {