diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/keyguard/KeyguardEsimArea.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardEsimArea.java b/packages/SystemUI/src/com/android/keyguard/KeyguardEsimArea.java index 6a86bb2b491f..38811ac85c8e 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardEsimArea.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardEsimArea.java @@ -21,6 +21,7 @@ import android.util.AttributeSet; import android.view.View; import android.widget.Button; import android.telephony.SubscriptionManager; +import android.telephony.SubscriptionInfo; import android.telephony.euicc.EuiccManager; import java.lang.ref.WeakReference; @@ -58,8 +59,11 @@ class KeyguardEsimArea extends Button implements View.OnClickListener { public static boolean isEsimLocked(Context context, int subId) { EuiccManager euiccManager = (EuiccManager) context.getSystemService(Context.EUICC_SERVICE); - return euiccManager.isEnabled() - && SubscriptionManager.from(context).getActiveSubscriptionInfo(subId).isEmbedded(); + if (!euiccManager.isEnabled()) { + return false; + } + SubscriptionInfo sub = SubscriptionManager.from(context).getActiveSubscriptionInfo(subId); + return sub != null && sub.isEmbedded(); } } |