commit 2fed4234e2e5670a2cf42ee02d8819cebe7baf4a
author Treehugger Robot <treehugger-gerrit@google.com> Fri Mar 27 14:40:33 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 27 14:40:33 2020 +0000
tree 5a6246afdc9e22a86e44caa3a17ce28df397ba08
parent 2af9edd009ba26385c486781f5afbfecf74c6476
parent 4f0acfde8d5c726379aef256009b80c4e947479b

Merge "Use System property to get the slot count"

src/java/com/android/internal/telephony/uicc/UiccController.java

diff --git a/src/java/com/android/internal/telephony/uicc/UiccController.java b/src/java/com/android/internal/telephony/uicc/UiccController.java
index 8f009e7..10addbf 100644
--- a/src/java/com/android/internal/telephony/uicc/UiccController.java
+++ b/src/java/com/android/internal/telephony/uicc/UiccController.java
@@ -34,6 +34,7 @@
 import android.os.RegistrantList;
 import android.os.storage.StorageManager;
 import android.preference.PreferenceManager;
+import android.sysprop.TelephonyProperties;
 import android.telephony.CarrierConfigManager;
 import android.telephony.TelephonyManager;
 import android.telephony.UiccCardInfo;
@@ -212,6 +213,7 @@
         mCis = PhoneFactory.getCommandsInterfaces();
         int numPhysicalSlots = c.getResources().getInteger(
                 com.android.internal.R.integer.config_num_physical_slots);
+        numPhysicalSlots = TelephonyProperties.sim_slots_count().orElse(numPhysicalSlots);
         if (DBG) {
             logWithLocalLog("config_num_physical_slots = " + numPhysicalSlots);
         }