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

Commit 8b477da8 authored by Suchand Ghosh's avatar Suchand Ghosh Committed by Steve Kondik
Browse files

IMS: Fix phone app crash at setOutgoingCallerIdDisplay(). 

Phone process crash due to duplicate callback received at
GsmPhone when launch additional call settings and click on
Caller ID->Hide number.
Correct logic to receive messge EVENT_SET_CLIR_COMPLETE by
the requested phone (GsmPhone or ImsPhone), not by both.

Change-Id: Iec19577b7bf567c769089c40c05c656754b694ae
CRs-Fixed: 990931
parent 0f88ef6b

src/java/com/android/internal/telephony/gsm/GSMPhone.java

+1 −2
Original line number Diff line number Diff line
@@ -1329,8 +1329,7 @@ public class GSMPhone extends PhoneBase { 
        ImsPhone imsPhone = mImsPhone;

        if ((imsPhone != null)

                && (imsPhone.getServiceState().getState() == ServiceState.STATE_IN_SERVICE)) {

            imsPhone.setOutgoingCallerIdDisplay(commandInterfaceCLIRMode,

            obtainMessage(EVENT_SET_CLIR_COMPLETE, commandInterfaceCLIRMode, 0, onComplete));

            imsPhone.setOutgoingCallerIdDisplay(commandInterfaceCLIRMode, onComplete);

            return;

        }

        // Packing CLIR value in the message. This will be required for