commit 626d0ddc3197c606c239b51dd4333c4697201339
author Treehugger Robot <treehugger-gerrit@google.com> Thu Mar 24 04:08:37 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Mar 24 04:08:37 2022 +0000
tree 106a0e27fe9aae8f9ec07023825fcf1468d9a79a
parent 3ac9b27836be8a6d52eda947a58ba397dc8e304d
parent d66bcb58b61d996d0b2ac766fa458fcf8ee7538f

Merge "Resist SIM logical channel leaking when clients crash" am: d66bcb58b6

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/2039345

Change-Id: I8f2004b084389fcea6e54d99ffa40c8bf4ee5c54

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) {