Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix NPE for KeyguardEsimArea#isEsimLocked" into oc-dr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-06-15 03:20:52 +00:00
committed by Android (Google) Code Review
parent 08cd707bad daca6f9b49
commit a3891ae678
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/keyguard/KeyguardEsimArea.java
View File

@@ -21,6 +21,7 @@ import android.util.AttributeSet;
import android.view.View; import android.view.View;
import android.widget.Button; import android.widget.Button;
import android.telephony.SubscriptionManager; import android.telephony.SubscriptionManager;
import android.telephony.SubscriptionInfo;
import android.telephony.euicc.EuiccManager; import android.telephony.euicc.EuiccManager;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;
@@ -58,8 +59,11 @@ class KeyguardEsimArea extends Button implements View.OnClickListener {
public static boolean isEsimLocked(Context context, int subId) { public static boolean isEsimLocked(Context context, int subId) {
EuiccManager euiccManager = EuiccManager euiccManager =
(EuiccManager) context.getSystemService(Context.EUICC_SERVICE); (EuiccManager) context.getSystemService(Context.EUICC_SERVICE);
return euiccManager.isEnabled() if (!euiccManager.isEnabled()) {
&& SubscriptionManager.from(context).getActiveSubscriptionInfo(subId).isEmbedded(); return false;
}
SubscriptionInfo sub = SubscriptionManager.from(context).getActiveSubscriptionInfo(subId);
return sub != null && sub.isEmbedded();
} }
} }