Revert "Modify PhoneCapabilities for device capabilities"
Revert "Modify PhoneCapabilities for device capabilities"
Revert submission 9919494-device_cap
Reason for revert: Change not supported by modem
Reverted Changes:
I3349c3e50:Modify PhoneCapabilities for device capabilities
I9f5312606:Modify PhoneCapabilities for device capabilities
I424ef1760:PhoneCapabilities changes for device capabilities
Ic00bb3ba8:Modify PhoneCapabilities for device capabilities
Change-Id: Ie89a592f2c15b74cdbef211114dfca8a5b7df29a
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 3a091ca..07b0e4a 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -2967,21 +2967,6 @@
}
@Override
- public PhoneCapability getPhoneCapability(int subId, String callingPackage,
- String callingFeatureId) {
- if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(
- mApp, subId, callingPackage, callingFeatureId, "getPhoneCapability")) {
- return null;
- }
- final long identity = Binder.clearCallingIdentity();
- try {
- return mPhoneConfigurationManager.getStaticPhoneCapability();
- } finally {
- Binder.restoreCallingIdentity(identity);
- }
- }
-
- @Override
public boolean isInEmergencySmsMode() {
enforceReadPrivilegedPermission("isInEmergencySmsMode");
final long identity = Binder.clearCallingIdentity();
@@ -7469,7 +7454,7 @@
loge("isMultiSimSupportedInternal: no static configuration available");
return TelephonyManager.MULTISIM_NOT_SUPPORTED_BY_HARDWARE;
}
- if (staticCapability.getLogicalModemUuids().size() < 2) {
+ if (staticCapability.logicalModemList.size() < 2) {
loge("isMultiSimSupportedInternal: maximum number of modem is < 2");
return TelephonyManager.MULTISIM_NOT_SUPPORTED_BY_HARDWARE;
}