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 
am: a3891ae678

Change-Id: Idb8f72137844d370fa9e95195dd6b57cbaf3391e
This commit is contained in:
qingxi
2017-06-15 03:25:07 +00:00
committed by android-build-merger
parent 668919209b a3891ae678
commit 96ee3db962
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.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();
}
}