diff options
| author | suryaprakash.konduru <suryaprakash.konduru@nxp.com> | 2023-02-01 11:19:11 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-02-01 11:19:11 +0000 |
| commit | fdc4f2238959187d45c60bdee856ee9a59371be4 (patch) | |
| tree | 7ecb9874e2fe8ae1c6c7ed1f798c466cf30a7c12 | |
| parent | 76d92b81b5a1f1156541a3ecb88bb868328d8816 (diff) | |
| parent | a6ddfefee7786e0a40fd2928e35895004cbb8004 (diff) | |
| download | SecureElement-fdc4f2238959187d45c60bdee856ee9a59371be4.tar.gz | |
Fix for null pointer exception when logical channel opened am: 87e5776a1e am: 94cef96ad6 am: a6ddfefee7
Original change: https://android-review.googlesource.com/c/platform/packages/apps/SecureElement/+/2411178
Change-Id: I5b0414267cdaa5cf3a965ab44b442e1ffd91c41f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | src/com/android/se/Terminal.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/com/android/se/Terminal.java b/src/com/android/se/Terminal.java index 25bb896..5bb3e3b 100644 --- a/src/com/android/se/Terminal.java +++ b/src/com/android/se/Terminal.java @@ -670,7 +670,7 @@ public class Terminal { try { responseArray[0] = new LogicalChannelResponse(); android.hardware.secure_element.LogicalChannelResponse aidlRs = - mAidlHal.openLogicalChannel(aid, p2); + mAidlHal.openLogicalChannel(aid == null ? new byte[0] : aid, p2); responseArray[0].channelNumber = aidlRs.channelNumber; responseArray[0].selectResponse = byteArrayToArrayList(aidlRs.selectResponse); } catch (RemoteException e) { @@ -712,7 +712,6 @@ public class Terminal { Channel logicalChannel = new Channel(session, this, channelNumber, selectResponse, aid, listener); logicalChannel.setChannelAccess(channelAccess); - mChannels.put(channelNumber, logicalChannel); return logicalChannel; } |