commit 0176b3221bded924661bb92de296749e11babac9
author Daniel Bright <dbright@google.com> Wed Feb 24 21:03:28 2021 +0000
committer Daniel Bright <dbright@google.com> Thu Feb 25 18:50:09 2021 +0000
tree c415ed7450f8385eb7df9e87ac103a0e1d35ef40
parent 5200630c589c6f90b2511aa842965a02d1ea8d03

Revert^2 "Update getRadioInterfaceCapabilities return type"

5200630c589c6f90b2511aa842965a02d1ea8d03

Change-Id: I19c5af83dab21f3be4312ea8b894302836257e1d
Merged-In: I137388287d102fb9ba6893ef286a4249efbc63d5

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 5760527..6125bd8 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;
@@ -9366,12 +9365,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);
         }
     }