diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-08-22 03:02:01 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-08-22 03:02:01 +0000 |
| commit | 6a50e65fbebbc5a98a9709274a27ac64fb1fb99f (patch) | |
| tree | ed7ef0d45f5f5115c5be92256019b79c953e2dd3 | |
| parent | 9d8ab3ae10ea90ca36519360c6000277917d79d5 (diff) | |
| parent | 1a09d5bc572be7a5a6ef42e41e6ba5a606e369d2 (diff) | |
| download | ims-android10-qpr1-b-s1-release.tar.gz | |
Snap for 5821595 from 1a09d5bc572be7a5a6ef42e41e6ba5a606e369d2 to qt-qpr1-releaseandroid-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android10-qpr1-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-release
Change-Id: I60c268ffb594554cbbb5132c372e17a91f038746
| -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) { |