Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7107f09 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "UiccProfile should handle responses after disposed" into pi-dev

parents c4bbf44e 88d0c791
Loading
Loading
Loading
Loading
+7 −1
Original line number Diff line number Diff line
@@ -157,7 +157,13 @@ public class UiccProfile extends IccCard {
    public final Handler mHandler = new Handler() {
        @Override
        public void handleMessage(Message msg) {
            if (mDisposed) {
            // We still need to handle the following response messages even the UiccProfile has been
            // disposed because whoever sent the request may be still waiting for the response.
            if (mDisposed && msg.what != EVENT_OPEN_LOGICAL_CHANNEL_DONE
                    && msg.what != EVENT_CLOSE_LOGICAL_CHANNEL_DONE
                    && msg.what != EVENT_TRANSMIT_APDU_LOGICAL_CHANNEL_DONE
                    && msg.what != EVENT_TRANSMIT_APDU_BASIC_CHANNEL_DONE
                    && msg.what != EVENT_SIM_IO_DONE) {
                loge("handleMessage: Received " + msg.what
                        + " after dispose(); ignoring the message");
                return;