commit 5200630c589c6f90b2511aa842965a02d1ea8d03
author Daniel Bright <dbright@google.com> Wed Feb 24 19:51:22 2021 +0000
committer Daniel Bright <dbright@google.com> Wed Feb 24 19:51:22 2021 +0000
tree e19171c4d3fa427ee13ebabae62f1fc6d8c3e5e4
parent b7fd25743f3547f88252d806393963a6ff83dd0a

Revert "Update getRadioInterfaceCapabilities return type"

Revert "Add CAPABILITY_ALLOWED_NETWORK_TYPES_USED"

Revert submission 1597527-capability_allowed_network_types

Reason for revert: Fix Build
Reverted Changes:
Icdee3444d:Add CAPABILITY_ALLOWED_NETWORK_TYPES_USED
I531256f85:Update getRadioInterfaceCapabilities return type
I92c2d019a:Add CAPABILITY_ALLOWED_NETWORK_TYPES_USED

Change-Id: I5d83ffbd4a357ddad6cf3e7a01f238ed23599bb9

src/com/android/phone/PhoneInterfaceManager.java

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