diff options
| author | Jack Yu <jackcwyu@google.com> | 2019-01-30 13:50:33 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-01-30 13:50:33 -0800 |
| commit | d95b3a4b4057f1f57f296758e7ae28a21a9d9c83 (patch) | |
| tree | 965009768520a2708bbc730053a7eadef761a55d | |
| parent | 4009cfd588b2b8bcf0f036fcf995172e42e9c008 (diff) | |
| parent | 56897e4787c5b33346a6862ac98a0e1aa510a9c9 (diff) | |
| download | SecureElement-d95b3a4b4057f1f57f296758e7ae28a21a9d9c83.tar.gz | |
Add backward compatibility for SEHAL am: 70a9077bd1
am: 56897e4787
Change-Id: I9a0c6e7c97fd9d9c4cc31da14de6d995754082a5
| -rw-r--r-- | src/com/android/se/Terminal.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/com/android/se/Terminal.java b/src/com/android/se/Terminal.java index 00382ef..f9e7cd5 100644 --- a/src/com/android/se/Terminal.java +++ b/src/com/android/se/Terminal.java @@ -171,8 +171,14 @@ public class Terminal { */ public void initialize() throws NoSuchElementException, RemoteException { synchronized (mLock) { - android.hardware.secure_element.V1_1.ISecureElement seHal11 = - android.hardware.secure_element.V1_1.ISecureElement.getService(mName, true); + android.hardware.secure_element.V1_1.ISecureElement seHal11 = null; + try { + seHal11 = + android.hardware.secure_element.V1_1.ISecureElement.getService(mName, true); + } catch (Exception e) { + Log.d(mTag, "SE Hal V1.1 is not supported"); + } + if (seHal11 == null) { mSEHal = ISecureElement.getService(mName, true); if (mSEHal == null) { |