commit c06dc8bace15d35fda791a4f4544a17979a3a170
author Sarah Chin <sarahchin@google.com> Tue Jan 28 17:26:11 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 28 17:26:11 2020 +0000
tree 06105d1b79da1140461d5c5c66feb666f61faf4b
parent 44ab7e55d5b4aa5683137ad71f4255860ab5c951
parent 5f0ecd7aa1fa914bb0a194a7f534e2a8557f7ca7

Merge "Modify PhoneCapabilities for device capabilities"

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 33621b2..9b75007 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -2979,6 +2979,21 @@
     }
 
     @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();
@@ -7731,7 +7746,7 @@
             loge("isMultiSimSupportedInternal: no static configuration available");
             return TelephonyManager.MULTISIM_NOT_SUPPORTED_BY_HARDWARE;
         }
-        if (staticCapability.logicalModemList.size() < 2) {
+        if (staticCapability.getLogicalModemUuids().size() < 2) {
             loge("isMultiSimSupportedInternal: maximum number of modem is < 2");
             return TelephonyManager.MULTISIM_NOT_SUPPORTED_BY_HARDWARE;
         }