commit 21e17b45a5114c1a23aa3a31052859858065b57f
author Daniel Bright <dbright@google.com> Wed Feb 24 19:59:07 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 24 19:59:07 2021 +0000
tree 103463d57aad33a2d37827536a18a4b86df0dc5b
parent 040cad12fc8d6c50442f807a76f4944147a86178
parent 5200630c589c6f90b2511aa842965a02d1ea8d03

Merge "Revert "Update getRadioInterfaceCapabilities return type""

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 111a38c..9510cae 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -88,6 +88,7 @@
 import android.telephony.PhoneNumberRange;
 import android.telephony.RadioAccessFamily;
 import android.telephony.RadioAccessSpecifier;
+import android.telephony.RadioInterfaceCapabilities;
 import android.telephony.ServiceState;
 import android.telephony.SignalStrength;
 import android.telephony.SignalStrengthUpdateRequest;
@@ -9404,12 +9405,12 @@
     @Override
     public boolean isRadioInterfaceCapabilitySupported(
             @NonNull @TelephonyManager.RadioInterfaceCapability String capability) {
-        Set<String> radioInterfaceCapabilities =
+        RadioInterfaceCapabilities radioInterfaceCapabilities =
                 mPhoneConfigurationManager.getRadioInterfaceCapabilities();
         if (radioInterfaceCapabilities == null) {
             throw new RuntimeException("radio interface capabilities are not available");
         } else {
-            return radioInterfaceCapabilities.contains(capability);
+            return radioInterfaceCapabilities.isSupported(capability);
         }
     }