diff options
| author | 2017-06-14 11:44:04 -0700 | |
|---|---|---|
| committer | 2017-06-15 00:55:30 +0000 | |
| commit | daca6f9b49813c4b51aae6a966ba42348b11ac84 (patch) | |
| tree | 3af00b0ae33476113a619b8fa3963972c3645e1d | |
| parent | 9ae7bb7aa3b9322e854c5809e6a3ec8524a9878f (diff) | |
Fix NPE for KeyguardEsimArea#isEsimLocked
Test: TreeHugger Robot
Bug: 62604222
Change-Id: I678ee2b2447617d76a1c3d30370a5de4156f7b06
(cherry picked from commit 2b06b0156dd9002f8745f1cd1dccd84ef9738aa5)
| -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(); } } |