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

Commit 07d3736f authored by Tyler Gunn's avatar Tyler Gunn
Browse files

Fix potential exceptions in CallDiagnosticService and missing locks. 

There is a possibility of a call receiving a details update when it has
already been removed from the CallDiagnosticService.  Handling this case
by just ignoring the details update (since it isn't relevant as the call
is now removed).
Also noted there were a number of places where access to the shared
maps was not synchronized as it should be.

Test: Run manual tests and note no more CDS crashes from SCONE app.
Fixes: 188939131
Change-Id: Ic1f96fd60a70432bef0daaa2e9729c66401ba4ac
parent 9b14a508

telecomm/java/android/telecom/CallDiagnosticService.java

+15 −6
Original line number Diff line number Diff line
@@ -294,6 +294,10 @@ public abstract class CallDiagnosticService extends Service { 
        CallDiagnostics callDiagnostics;

        synchronized (mLock) {

            callDiagnostics = mDiagnosticCallByTelecomCallId.get(telecomCallId);

            if (callDiagnostics == null) {

                // Possible to get a call update after a call is removed.

                return;

            }

            mCallByTelecomCallId.put(telecomCallId, newCallDetails);

        }

        getExecutor().execute(() -> callDiagnostics.handleCallUpdated(newCallDetails));
@@ -306,12 +310,12 @@ public abstract class CallDiagnosticService extends Service { 
    private void handleCallRemoved(@NonNull String telecomCallId) {

        Log.i(this, "handleCallRemoved: callId=%s - removed", telecomCallId);



        CallDiagnostics callDiagnostics;

        synchronized (mLock) {

            if (mCallByTelecomCallId.containsKey(telecomCallId)) {

                mCallByTelecomCallId.remove(telecomCallId);

            }



        CallDiagnostics callDiagnostics;

        synchronized (mLock) {

            if (mDiagnosticCallByTelecomCallId.containsKey(telecomCallId)) {

                callDiagnostics = mDiagnosticCallByTelecomCallId.remove(telecomCallId);

            } else {
@@ -353,7 +357,10 @@ public abstract class CallDiagnosticService extends Service { 
    private void handleCallDisconnected(@NonNull String callId,

            @NonNull DisconnectCause disconnectCause) {

        Log.i(this, "handleCallDisconnected: call=%s; cause=%s", callId, disconnectCause);

        CallDiagnostics callDiagnostics = mDiagnosticCallByTelecomCallId.get(callId);

        CallDiagnostics callDiagnostics;

        synchronized (mLock) {

            callDiagnostics = mDiagnosticCallByTelecomCallId.get(callId);

        }

        CharSequence message;

        if (disconnectCause.getImsReasonInfo() != null) {

            message = callDiagnostics.onCallDisconnected(disconnectCause.getImsReasonInfo());
@@ -391,7 +398,9 @@ public abstract class CallDiagnosticService extends Service { 
            @NonNull CallQuality callQuality) {

        Log.i(this, "handleCallQualityChanged; call=%s, cq=%s", callId, callQuality);

        CallDiagnostics callDiagnostics;

        synchronized(mLock) {

            callDiagnostics = mDiagnosticCallByTelecomCallId.get(callId);

        }

        if (callDiagnostics != null) {

            callDiagnostics.onCallQualityReceived(callQuality);

        }