diff options
| author | Hall Liu <hallliu@google.com> | 2019-08-21 11:37:39 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-08-21 11:37:39 -0700 |
| commit | 1a09d5bc572be7a5a6ef42e41e6ba5a606e369d2 (patch) | |
| tree | ed7ef0d45f5f5115c5be92256019b79c953e2dd3 | |
| parent | 3e13d1041b923e278e7999be2ad786fee102e93c (diff) | |
| parent | 4aff980d7409acc9751685654f96da212d025911 (diff) | |
| download | ims-1a09d5bc572be7a5a6ef42e41e6ba5a606e369d2.tar.gz | |
Check carrierconfig for whether to ignore RTT modeandroid-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-mainline-releaseandroid10-mainline-media-releaseandroid10-d4-s1-releaseandroid10-d4-release
am: 4aff980d74
Change-Id: Ic4a4e3d709587dcc4e1ab982456cc5d4639ca1fa
| -rw-r--r-- | src/java/com/android/ims/ImsManager.java | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/java/com/android/ims/ImsManager.java b/src/java/com/android/ims/ImsManager.java index ab56d291..7c24c7dc 100644 --- a/src/java/com/android/ims/ImsManager.java +++ b/src/java/com/android/ims/ImsManager.java @@ -2149,13 +2149,20 @@ public class ImsManager { public boolean updateRttConfigValue() { boolean isCarrierSupported = getBooleanCarrierConfig(CarrierConfigManager.KEY_RTT_SUPPORTED_BOOL); - boolean isRttEnabled = Settings.Secure.getInt(mContext.getContentResolver(), + boolean isRttUiSettingEnabled = Settings.Secure.getInt(mContext.getContentResolver(), Settings.Secure.RTT_CALLING_MODE, 0) != 0; - Log.i(ImsManager.class.getSimpleName(), "update RTT value " + isRttEnabled); - if (isCarrierSupported == true) { - setRttConfig(isRttEnabled); + boolean isRttAlwaysOnCarrierConfig = getBooleanCarrierConfig( + CarrierConfigManager.KEY_IGNORE_RTT_MODE_SETTING_BOOL); + + boolean shouldImsRttBeOn = isRttUiSettingEnabled || isRttAlwaysOnCarrierConfig; + Log.i(ImsManager.class.getSimpleName(), "update RTT: settings value: " + + isRttUiSettingEnabled + " always-on carrierconfig: " + + isRttAlwaysOnCarrierConfig); + + if (isCarrierSupported) { + setRttConfig(shouldImsRttBeOn); } - return isCarrierSupported && isRttEnabled; + return isCarrierSupported && shouldImsRttBeOn; } private void setRttConfig(boolean enabled) { |