[NFC] when use android.hardware.secure_element.V1_0.ISecureElement.isCardPresent() and do not judge it (private ISecureElement mSEHal) first, maybe will cause java.lang.NullPointerException am: 9da7efacee am: d4d2f9481d Original change: https://android-review.googlesource.com/c/platform/packages/apps/SecureElement/+/3220355 Change-Id: I852b5c6ddfd184b05189f8ddb2662240f0bbead3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/src/com/android/se/Terminal.java b/src/com/android/se/Terminal.java index aba77bb..a15f34f 100644 --- a/src/com/android/se/Terminal.java +++ b/src/com/android/se/Terminal.java
@@ -876,8 +876,10 @@ try { if (mAidlHal != null) { return mAidlHal.isCardPresent(); - } else { + } else if (mSEHal != null) { return mSEHal.isCardPresent(); + } else { + return false; } } catch (ServiceSpecificException e) { Log.e(mTag, "Error in isSecureElementPresent() " + e);