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

Commit 0ee3f70b authored by html6405's avatar html6405 Committed by Rohit Sekhar
Browse files

telephony: debug SubscriptionController 

Change-Id: Ia8d64a69030a438985fda4e078e5f944ccdd6f13
parent 059bac10

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

+5 −0
Original line number Diff line number Diff line
@@ -2342,10 +2342,12 @@ public class ServiceStateTracker extends Handler { 
                                && !mIsSimReady;

                if (mEmergencyOnly && !forceDisplayNoService) {

                    // No service but emergency call allowed

                    SystemProperties.set("gsm.status", "0");

                    plmn = Resources.getSystem().

                            getText(com.android.internal.R.string.emergency_calls_only).toString();

                } else {

                    // No service at all

                    SystemProperties.set("gsm.status", "1");

                    plmn = Resources.getSystem().

                            getText(com.android.internal.R.string.lockscreen_carrier_default).toString();

                    noService = true;
@@ -2354,12 +2356,14 @@ public class ServiceStateTracker extends Handler { 
                        "of service, set plmn='" + plmn + "'");

            } else if (combinedRegState == ServiceState.STATE_IN_SERVICE) {

                // In either home or roaming service

                SystemProperties.set("gsm.status", "2");

                plmn = mSS.getOperatorAlpha();

                showPlmn = !TextUtils.isEmpty(plmn) &&

                        ((rule & SIMRecords.SPN_RULE_SHOW_PLMN)

                                == SIMRecords.SPN_RULE_SHOW_PLMN);

            } else {

                // Power off state, such as airplane mode, show plmn as "No service"

                SystemProperties.set("gsm.status", "3");

                showPlmn = true;

                plmn = Resources.getSystem().

                        getText(com.android.internal.R.string.lockscreen_carrier_default).toString();
@@ -2412,6 +2416,7 @@ public class ServiceStateTracker extends Handler { 
                    || !TextUtils.equals(spn, mCurSpn)

                    || !TextUtils.equals(dataSpn, mCurDataSpn)

                    || !TextUtils.equals(plmn, mCurPlmn)) {

                SystemProperties.set("gsm.plmn", plmn);

                if (DBG) {

                    log(String.format("updateSpnDisplay: changed sending intent rule=" + rule +

                            " showPlmn='%b' plmn='%s' showSpn='%b' spn='%s' dataSpn='%s' " +

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

+3 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.net.Uri; 
import android.os.Binder;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.SystemProperties;

import android.os.UserHandle;

import android.provider.Settings;

import android.telephony.RadioAccessFamily;
@@ -1412,6 +1413,7 @@ public class SubscriptionController extends ISub.Stub { 


    @Override

    public int getSlotIndex(int subId) {

        SystemProperties.set("gsm.subid", String.valueOf(subId));

        if (VDBG) printStackTrace("[getSlotIndex] subId=" + subId);



        if (subId == SubscriptionManager.DEFAULT_SUBSCRIPTION_ID) {
@@ -1419,6 +1421,7 @@ public class SubscriptionController extends ISub.Stub { 
        }

        if (!SubscriptionManager.isValidSubscriptionId(subId)) {

            if (DBG) logd("[getSlotIndex]- subId invalid");

            SystemProperties.set("gsm.radioreset", "true");

            return SubscriptionManager.INVALID_SIM_SLOT_INDEX;

        }

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

+2 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import android.os.Looper; 
import android.os.Message;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.SystemProperties;

import android.preference.PreferenceManager;

import android.provider.Settings;

import android.provider.Settings.Global;
@@ -825,6 +826,7 @@ public class SubscriptionInfoUpdater extends Handler { 
        SubscriptionManager.putPhoneIdAndSubIdExtra(i, slotId);

        logd("Broadcasting intent ACTION_SIM_STATE_CHANGED " + state + " reason " + reason +

             " for mCardIndex: " + slotId);

        SystemProperties.set("gsm.sim_state", state);

        IntentBroadcaster.getInstance().broadcastStickyIntent(i, slotId);

    }