diff options
author | Brad Ebinger <breadley@google.com> | 2018-03-21 20:38:19 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-03-21 20:38:19 +0000 |
commit | 0c4576e097e851931e2edc42fc5d096941216f95 (patch) | |
tree | e8c876ffc3f6ecb145e3e0256751aa33d11b80d9 | |
parent | 94e56892df693c7ec6ca591f8c78dee60b01d3d3 (diff) | |
parent | 2384f4290ee73ca55d58db0f6cd40bc409ccecd3 (diff) | |
download | ims-0c4576e097e851931e2edc42fc5d096941216f95.tar.gz |
Merge "Fix error in setVtSetting logic" into pi-dev
-rw-r--r-- | src/java/com/android/ims/ImsManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/java/com/android/ims/ImsManager.java b/src/java/com/android/ims/ImsManager.java index 2a35fd37..2b348960 100644 --- a/src/java/com/android/ims/ImsManager.java +++ b/src/java/com/android/ims/ImsManager.java @@ -771,7 +771,7 @@ public class ImsManager { if (enabled) { log("setVtSetting(b) : turnOnIms"); turnOnIms(); - } else if (isVolteEnabledByPlatform() + } else if (isTurnOffImsAllowedByPlatform() && (!isVolteEnabledByPlatform() || !isEnhanced4gLteModeSettingEnabledByUser())) { log("setVtSetting(b) : imsServiceAllowTurnOff -> turnOffIms"); |