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

Commit b1485ba1 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Promotion of android-framework.lnx.2.0.c1-00004. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1077353   Id1a9c5c7cfd3cd8342941ce9c04a97bd52671259   Check if spn should be added

Change-Id: I077aee9ab503199722f47a35ad3c8bf19438549e
CRs-Fixed: 1077353
parents 742a662f 33fed856

packages/Keyguard/src/com/android/keyguard/CarrierText.java

+17 −3
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import android.os.SystemProperties; 
import com.android.internal.telephony.IccCardConstants;

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

import com.android.internal.telephony.TelephonyIntents;

import com.android.internal.telephony.PhoneConstants;

import com.android.settingslib.WirelessUtils;

import android.telephony.TelephonyManager;
@@ -255,7 +256,7 @@ public class CarrierText extends TextView { 
        /*

         * In the case where there is only one sim inserted in a multisim device, if

         * the voice registration service state is reported as 12 (no service with emergency)

         * for at least one of the sim concatenate the sim state with Emergency calls only"

         * for at least one of the sim concatenate the sim state with "Emergency calls only"

         */

        if (N < TelephonyManager.getDefault().getPhoneCount() &&

                 mKeyguardUpdateMonitor.isEmergencyOnly()) {
@@ -265,10 +266,23 @@ public class CarrierText extends TextView { 
                Log.d(TAG, " Present sim - sub id: " + presentSubId);

            }

            if (presentSubId != -1) {

                CharSequence emergencyOnlyText =

                CharSequence text =

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

                Intent spnUpdatedIntent = getContext().registerReceiver(null,

                        new IntentFilter(TelephonyIntents.SPN_STRINGS_UPDATED_ACTION));

                if (spnUpdatedIntent != null) {

                    String spn = "";

                    if (spnUpdatedIntent.getBooleanExtra(TelephonyIntents.EXTRA_SHOW_SPN, false) &&

                            spnUpdatedIntent.getIntExtra(PhoneConstants.SUBSCRIPTION_KEY, -1) ==

                                presentSubId) {

                        spn = spnUpdatedIntent.getStringExtra(TelephonyIntents.EXTRA_SPN);

                        if (!spn.equals(text.toString())) {

                            text = concatenate(text, spn);

                        }

                    }

                }

                displayText = getCarrierTextForSimState(

                        mKeyguardUpdateMonitor.getSimState(presentSubId), emergencyOnlyText);

                        mKeyguardUpdateMonitor.getSimState(presentSubId), text);

            }

        }

        if (allSimsMissing) {