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

Commit 72aab106 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Keyguard: Add null checks for show spn and plmn flags"

parents d0534dfa 7e79b3cd

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

+2 −1
Original line number Diff line number Diff line
@@ -1058,7 +1058,8 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { 
        }



        //display 2G/3G/4G if operator ask for showing radio tech

        if ((mServiceState.get(subId) != null) && (mServiceState.get(subId).getDataRegState()

        if ((mServiceState.get(subId) != null) && (mShowSpn.get(subId) != null) &&

                (mShowPlmn.get(subId) != null) && (mServiceState.get(subId).getDataRegState()

                == ServiceState.STATE_IN_SERVICE || mServiceState.get(subId).getVoiceRegState()

                == ServiceState.STATE_IN_SERVICE) && mContext.getResources().getBoolean(

                com.android.internal.R.bool.config_display_rat)) {