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

Commit 4a7d9c45 authored by yinxu's avatar yinxu Committed by android-build-merger
Browse files

Merge "UiccProfile should handle responses after disposed"

am: f2fdf33d

Change-Id: I2ea381da01e1cfefca6b64dddda85a6bd37e0238
parents 4d180ee0 f2fdf33d
Loading
Loading
Loading
Loading
+7 −1
Original line number Diff line number Diff line
@@ -212,7 +212,13 @@ public class UiccProfile extends Handler implements IccCard {

    @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;
        }