commit 8b616c98f2229f0fb07cb2368b70d7c0f95ea474
author Sooraj Sasindran <sasindran@google.com> Thu Mar 11 15:58:03 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Mar 11 15:58:03 2021 +0000
tree ff0832c902699e7ca8a7533100a8c66573a9e70a
parent 8f2b1ad855515b7b50b218c965958ab18345fe95
parent 3126c67dbb517ac6096a6d92304968bf31461bde

Merge "Return REQUEST_NOT_SUPPORTED if HAL version is below 1.6" am: ae5a6a7110 am: 3126c67dbb

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1615836

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibe16ac985c55760fb78eb352c3642a716ebab511

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 14b1b95..348f4ce 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -864,6 +864,10 @@
                                 request.result =
                                         TelephonyManager
                                                 .ENABLE_NR_DUAL_CONNECTIVITY_RADIO_NOT_AVAILABLE;
+                            } else if (error == CommandException.Error.REQUEST_NOT_SUPPORTED) {
+                                request.result =
+                                        TelephonyManager
+                                                .ENABLE_NR_DUAL_CONNECTIVITY_NOT_SUPPORTED;
                             }
                             loge("enableNrDualConnectivity" + ": CommandException: "
                                     + ar.exception);