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

Commit 08b4e486 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topic "getSimStateForSlotIndex" 

* changes:
  Migrate getSimStateForSlotIndex to TelephonyManager
  Added few more APIs
parents dcfed6ee 920fd8a1

src/java/com/android/internal/telephony/SubscriptionController.java

+0 −41
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ import android.util.Log; 


import com.android.ims.ImsManager;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.telephony.IccCardConstants.State;

import com.android.internal.telephony.data.PhoneSwitcher;

import com.android.internal.telephony.metrics.TelephonyMetrics;

import com.android.internal.telephony.uicc.IccUtils;
@@ -3163,46 +3162,6 @@ public class SubscriptionController extends ISub.Stub { 
        return retVal;

    }



    /**

     * Get the SIM state for the slot index.

     * For Remote-SIMs, this method returns {@link IccCardConstants.State#UNKNOWN}

     * @return SIM state as the ordinal of {@link IccCardConstants.State}

     */

    @Override

    public int getSimStateForSlotIndex(int slotIndex) {

        State simState;

        String err;

        if (slotIndex < 0) {

            simState = IccCardConstants.State.UNKNOWN;

            err = "invalid slotIndex";

        } else {

            Phone phone = null;

            try {

                phone = PhoneFactory.getPhone(slotIndex);

            } catch (IllegalStateException e) {

                // ignore

            }

            if (phone == null) {

                simState = IccCardConstants.State.UNKNOWN;

                err = "phone == null";

            } else {

                IccCard icc = phone.getIccCard();

                if (icc == null) {

                    simState = IccCardConstants.State.UNKNOWN;

                    err = "icc == null";

                } else {

                    simState = icc.getState();

                    err = "";

                }

            }

        }

        if (VDBG) {

            logd("getSimStateForSlotIndex: " + err + " simState=" + simState

                    + " ordinal=" + simState.ordinal() + " slotIndex=" + slotIndex);

        }

        return simState.ordinal();

    }



    /**

     * Store properties associated with SubscriptionInfo in database

     * @param subId Subscription Id of Subscription

src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java

+151 −55

File changed.

Preview size limit exceeded, changes collapsed.

tests/telephonytests/src/com/android/internal/telephony/TelephonyTest.java

+4 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ import com.android.internal.telephony.data.DataRetryManager; 
import com.android.internal.telephony.data.DataServiceManager;

import com.android.internal.telephony.data.DataSettingsManager;

import com.android.internal.telephony.data.LinkBandwidthEstimator;

import com.android.internal.telephony.data.PhoneSwitcher;

import com.android.internal.telephony.emergency.EmergencyNumberTracker;

import com.android.internal.telephony.imsphone.ImsExternalCallTracker;

import com.android.internal.telephony.imsphone.ImsPhone;
@@ -212,6 +213,7 @@ public abstract class TelephonyTest { 
    protected RuimRecords mRuimRecords;

    protected IsimUiccRecords mIsimUiccRecords;

    protected ProxyController mProxyController;

    protected PhoneSwitcher mPhoneSwitcher;

    protected Singleton<IActivityManager> mIActivityManagerSingleton;

    protected IActivityManager mIActivityManager;

    protected IIntentSender mIIntentSender;
@@ -441,6 +443,7 @@ public abstract class TelephonyTest { 
        mRuimRecords = Mockito.mock(RuimRecords.class);

        mIsimUiccRecords = Mockito.mock(IsimUiccRecords.class);

        mProxyController = Mockito.mock(ProxyController.class);

        mPhoneSwitcher = Mockito.mock(PhoneSwitcher.class);

        mIActivityManagerSingleton = Mockito.mock(Singleton.class);

        mIActivityManager = Mockito.mock(IActivityManager.class);

        mIIntentSender = Mockito.mock(IIntentSender.class);
@@ -806,6 +809,7 @@ public abstract class TelephonyTest { 
        replaceInstance(CdmaSubscriptionSourceManager.class, "sInstance", null, mCdmaSSM);

        replaceInstance(SubscriptionController.class, "sInstance", null, mSubscriptionController);

        replaceInstance(ProxyController.class, "sProxyController", null, mProxyController);

        replaceInstance(PhoneSwitcher.class, "sPhoneSwitcher", null, mPhoneSwitcher);

        replaceInstance(ActivityManager.class, "IActivityManagerSingleton", null,

                mIActivityManagerSingleton);

        replaceInstance(CdmaSubscriptionSourceManager.class,

tests/telephonytests/src/com/android/internal/telephony/subscription/SubscriptionManagerServiceTest.java

+75 −3

File changed.

Preview size limit exceeded, changes collapsed.