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

Commit 346d3b47 authored by Kenji Soutome's avatar Kenji Soutome Committed by Yoshiaki Naka
Browse files

Avoid deadlock in getIccSimChallengeResponse() when disposing IccRecords 

The lock object 'mLock' must be cared in IccRecords.dispose() as there
might be another thread waiting in getIccSimChallengeResponse().
EVENT_AKA_AUTHENTICATE_DONE never comes to IccRecords.handleMessage() if
IccRecords has already been disposed. That is because such events are
ignored in handleMessage() of the derived classes.

Change-Id: I8b36d4b44bc07bf5281325fb759b7a8dac0a8a32
parent 8033cae2

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

100644 → 100755
+13 −0
Original line number Diff line number Diff line
@@ -176,6 +176,14 @@ public abstract class IccRecords extends Handler implements IccConstants { 
     */

    public void dispose() {

        mDestroyed.set(true);



        // It is possible that there is another thread waiting for the response

        // to requestIccSimAuthentication() in getIccSimChallengeResponse().

        auth_rsp = null;

        synchronized (mLock) {

            mLock.notifyAll();

        }



        mParentApp = null;

        mFh = null;

        mCi = null;
@@ -693,6 +701,11 @@ public abstract class IccRecords extends Handler implements IccConstants { 
            return null;

        }



        if (auth_rsp == null) {

            loge("getIccSimChallengeResponse: No authentication response");

            return null;

        }



        if (DBG) log("getIccSimChallengeResponse: return auth_rsp");



        return android.util.Base64.encodeToString(auth_rsp.payload, android.util.Base64.NO_WRAP);