commit 040cad12fc8d6c50442f807a76f4944147a86178
author Daniel Bright <dbright@google.com> Wed Feb 24 18:36:19 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 24 18:36:19 2021 +0000
tree e6ee4730f229075d1b1dd8362493c3b5cc5b2fa2
parent 9121c73da060da391c8d7b6e754456651b80519b
parent b7fd25743f3547f88252d806393963a6ff83dd0a

Merge "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 9510cae..111a38c 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -88,7 +88,6 @@
 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;
@@ -9405,12 +9404,12 @@
     @Override
     public boolean isRadioInterfaceCapabilitySupported(
             @NonNull @TelephonyManager.RadioInterfaceCapability String capability) {
-        RadioInterfaceCapabilities radioInterfaceCapabilities =
+        Set<String> radioInterfaceCapabilities =
                 mPhoneConfigurationManager.getRadioInterfaceCapabilities();
         if (radioInterfaceCapabilities == null) {
             throw new RuntimeException("radio interface capabilities are not available");
         } else {
-            return radioInterfaceCapabilities.isSupported(capability);
+            return radioInterfaceCapabilities.contains(capability);
         }
     }