Update getRadioInterfaceCapabilities return type
Test: tested on local device
Bug: 163168917
Change-Id: I137388287d102fb9ba6893ef286a4249efbc63d5
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 740a37d..b790e39 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;
@@ -9443,14 +9442,13 @@
@Override
public boolean isRadioInterfaceCapabilitySupported(
- @NonNull @TelephonyManager.RadioInterfaceCapability String capability) {
- RadioInterfaceCapabilities radioInterfaceCapabilities =
+ final @NonNull @TelephonyManager.RadioInterfaceCapability String capability) {
+ 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);
}
@Override