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

Commit 4567f3a2 authored by Aaron Liu's avatar Aaron Liu Committed by Android (Google) Code Review
Browse files

Merge "Do no use text sub for empty string in sim." into main

parents 10e03dfa 1ad1e0c8

packages/SystemUI/src/com/android/keyguard/KeyguardSimPinViewController.java

+7 −2
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.telephony.PinResult; 
import android.telephony.SubscriptionInfo;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

import android.text.TextUtils;

import android.util.Log;

import android.view.View;

import android.view.WindowManager;
@@ -39,9 +40,9 @@ import android.widget.ImageView; 
import com.android.internal.util.LatencyTracker;

import com.android.internal.widget.LockPatternUtils;

import com.android.keyguard.KeyguardSecurityModel.SecurityMode;

import com.android.systemui.res.R;

import com.android.systemui.classifier.FalsingCollector;

import com.android.systemui.flags.FeatureFlags;

import com.android.systemui.res.R;



public class KeyguardSimPinViewController

        extends KeyguardPinBasedInputViewController<KeyguardSimPinView> {
@@ -324,7 +325,11 @@ public class KeyguardSimPinViewController 
        } else {

            SubscriptionInfo info = mKeyguardUpdateMonitor.getSubscriptionInfoForSubId(mSubId);

            CharSequence displayName = info != null ? info.getDisplayName() : ""; // don't crash

            if (!TextUtils.isEmpty(displayName)) {

                msg = rez.getString(R.string.kg_sim_pin_instructions_multi, displayName);

            } else {

                msg = rez.getString(R.string.kg_sim_pin_instructions);

            }

            if (info != null) {

                color = info.getIconTint();

            }

packages/SystemUI/src/com/android/keyguard/KeyguardSimPukViewController.java

+7 −2
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.telephony.PinResult; 
import android.telephony.SubscriptionInfo;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

import android.text.TextUtils;

import android.util.Log;

import android.view.WindowManager;

import android.widget.ImageView;
@@ -36,9 +37,9 @@ import android.widget.ImageView; 
import com.android.internal.util.LatencyTracker;

import com.android.internal.widget.LockPatternUtils;

import com.android.keyguard.KeyguardSecurityModel.SecurityMode;

import com.android.systemui.res.R;

import com.android.systemui.classifier.FalsingCollector;

import com.android.systemui.flags.FeatureFlags;

import com.android.systemui.res.R;



public class KeyguardSimPukViewController

        extends KeyguardPinBasedInputViewController<KeyguardSimPukView> {
@@ -206,7 +207,11 @@ public class KeyguardSimPukViewController 
        } else {

            SubscriptionInfo info = mKeyguardUpdateMonitor.getSubscriptionInfoForSubId(mSubId);

            CharSequence displayName = info != null ? info.getDisplayName() : "";

            if (!TextUtils.isEmpty(displayName)) {

                msg = rez.getString(R.string.kg_puk_enter_puk_hint_multi, displayName);

            } else {

                msg = rez.getString(R.string.kg_puk_enter_puk_hint);

            }

            if (info != null) {

                color = info.getIconTint();

            }