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

Commit 88e59571 authored by haiyangl's avatar haiyangl Committed by Gerrit - the friendly Code Review server
Browse files

Keyguard: Don't show "emergency call only" in OOS state 

UE should not show "emergency call only" as plmn if UE is in OOS.

Replace "emergency call" with "no service" when service state is
STATE_OUT_OF_SERVICE and isEmergencyOnly is false since it can't make
emergency call.

CRs-Fixed: 693739

Change-Id: I88375e80b7301a08453a145d02d9677aa7f14873
parent 4ac8d879

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

+18 −4
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ import com.google.android.collect.Lists; 
import java.lang.ref.WeakReference;

import java.util.ArrayList;

import java.util.HashMap;

import java.util.Iterator;

import java.util.List;



/**
@@ -1229,9 +1230,9 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { 
            final String plmn = intent.getStringExtra(TelephonyIntents.EXTRA_PLMN);

            String strEmergencyCallOnly = mContext.getResources().getText(

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

            if (mContext.getResources().getBoolean(

                    R.bool.config_showEmergencyCallOnlyInLockScreen)

                && plmn.equalsIgnoreCase(strEmergencyCallOnly)) {

            if (mContext.getResources().getBoolean(R.bool.config_showEmergencyButton)

                    && plmn.equalsIgnoreCase(strEmergencyCallOnly)

                    && !canMakeEmergencyCall()) {

                return getDefaultPlmn();

            } else {

                return (plmn != null) ? plmn : getDefaultPlmn();
@@ -1240,6 +1241,19 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { 
        return null;

    }



    private boolean canMakeEmergencyCall() {

        Iterator iter = mServiceState.entrySet().iterator();

        while (iter.hasNext()) {

            HashMap.Entry entry = (HashMap.Entry) iter.next();

            ServiceState state = (ServiceState) entry.getValue();

            if ((state != null) && (state.isEmergencyOnly() ||

                    state.getVoiceRegState() != ServiceState.STATE_OUT_OF_SERVICE)) {

                return true;

            }

        }

        return false;

    }



    /**

     * @return The default plmn (no service)

     */