commit d66bcb58b61d996d0b2ac766fa458fcf8ee7538f
author Treehugger Robot <treehugger-gerrit@google.com> Thu Mar 24 01:36:49 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 24 01:36:49 2022 +0000
tree 106a0e27fe9aae8f9ec07023825fcf1468d9a79a
parent c89612d5507b3152a1ad7277a69e7fcaeddd3229
parent 805c717f6dc64bf2fe08f9eff731817e2f549bd1

Merge "Resist SIM logical channel leaking when clients crash"

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 51540b3..fdc1f1f 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -749,6 +749,12 @@
                         }
                         openChannelResp = new IccOpenLogicalChannelResponse(channelId,
                             IccOpenLogicalChannelResponse.STATUS_NO_ERROR, selectResponse);
+
+                        uiccPort = getUiccPortFromRequest(request);
+                        IccLogicalChannelRequest channelRequest =
+                                (IccLogicalChannelRequest) request.argument;
+                        channelRequest.channel = channelId;
+                        uiccPort.onLogicalChannelOpened(channelRequest);
                     } else {
                         if (ar.result == null) {
                             loge("iccOpenLogicalChannel: Empty response");
@@ -791,6 +797,9 @@
                     request = (MainThreadRequest) ar.userObj;
                     if (ar.exception == null) {
                         request.result = true;
+                        uiccPort = getUiccPortFromRequest(request);
+                        final int channelId = (Integer) request.argument;
+                        uiccPort.onLogicalChannelClosed(channelId);
                     } else {
                         request.result = false;
                         if (ar.exception instanceof CommandException) {