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

Commit 5ce51106 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix potential hang in getIccSimChallengeResponse"

parents a500d67c b106d4b1

src/java/com/android/internal/telephony/uicc/IsimUiccRecords.java

+4 −4
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ public final class IsimUiccRecords extends IccRecords implements IsimRecords { 


    private static final int EVENT_APP_READY = 1;

    private static final int EVENT_ISIM_REFRESH = 31;

    private static final int EVENT_AKA_AUTHENTICATE_DONE          = 90;

    private static final int EVENT_ISIM_AUTHENTICATE_DONE          = 91;



    // ISIM EF records (see 3GPP TS 31.103)

    private String mIsimImpi;               // IMS private user identity
@@ -130,9 +130,9 @@ public final class IsimUiccRecords extends IccRecords implements IsimRecords { 
                    }

                    break;



                case EVENT_AKA_AUTHENTICATE_DONE:

                case EVENT_ISIM_AUTHENTICATE_DONE:

                    ar = (AsyncResult)msg.obj;

                    log("EVENT_AKA_AUTHENTICATE_DONE");

                    log("EVENT_ISIM_AUTHENTICATE_DONE");

                    if (ar.exception != null) {

                        log("Exception ISIM AKA: " + ar.exception);

                    } else {
@@ -437,7 +437,7 @@ public final class IsimUiccRecords extends IccRecords implements IsimRecords { 
        if (DBG) log("getIsimChallengeResponse-nonce:"+nonce);

        try {

            synchronized(mLock) {

                mCi.requestIsimAuthentication(nonce,obtainMessage(EVENT_AKA_AUTHENTICATE_DONE));

                mCi.requestIsimAuthentication(nonce,obtainMessage(EVENT_ISIM_AUTHENTICATE_DONE));

                try {

                    mLock.wait();

                } catch (InterruptedException e) {