commit 09f38ee33b84d01018282c432cb0ed63af96a211
author Sarah Chin <sarahchin@google.com> Tue Feb 25 00:13:10 2020 +0000
committer Sarah Chin <sarahchin@google.com> Tue Feb 25 00:16:53 2020 +0000
tree ebe3db76fec5bdda896a2e3c826d50a709ed5e02
parent 5f0ecd7aa1fa914bb0a194a7f534e2a8557f7ca7

Revert "Modify PhoneCapabilities for device capabilities"

This reverts commit 5f0ecd7aa1fa914bb0a194a7f534e2a8557f7ca7.

Reason for revert: Change not supported by vendor

Change-Id: Icafb491072578d2eed234a285fba0b9a5f1eaab4
Merged-In: Ie89a592f2c15b74cdbef211114dfca8a5b7df29a

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 1987756..f11da4b 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();
@@ -7706,7 +7691,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;
         }