Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 850236c6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use System property to get the slot count" am: 2fed4234 

Change-Id: I4adf9c8df96ffcfa68bad7d4661a42e42e7c1fdb
parents e0f5196a 2fed4234

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

+2 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import android.os.Registrant; 
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 @@ public class UiccController extends Handler { 
        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);

        }