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

Commit 18e74c61 authored by terrycrhuang's avatar terrycrhuang Committed by Automerger Merge Worker
Browse files

Fix phone crash by multiple result messages am: 237e9e96 am: 2993c5e4 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1927022

Change-Id: I9deaf67c4fc4751c7a45c9b648b941906144df37
parents d914ac57 2993c5e4

src/java/com/android/internal/telephony/RIL.java

+23 −22
Original line number Diff line number Diff line
@@ -4170,6 +4170,7 @@ public class RIL extends BaseCommands implements CommandsInterface { 
    public void startLceService(int reportIntervalMs, boolean pullMode, Message result) {

        IRadio radioProxy = getRadioProxy(result);



        if (radioProxy != null) {

            if (mRadioVersion.greaterOrEqual(RADIO_HAL_VERSION_1_2)) {

                // We have a 1.2 or later radio, so the LCE 1.0 LCE service control path is unused.

                // Instead the LCE functionality is always-on and provides unsolicited indications.
@@ -4182,7 +4183,6 @@ public class RIL extends BaseCommands implements CommandsInterface { 
                return;

            }



        if (radioProxy != null) {

            RILRequest rr = obtainRequest(RIL_REQUEST_START_LCE, result, mRILDefaultWorkSource);



            if (RILJ_LOGD) {
@@ -4201,6 +4201,8 @@ public class RIL extends BaseCommands implements CommandsInterface { 
    @Override

    public void stopLceService(Message result) {

        IRadio radioProxy = getRadioProxy(result);



        if (radioProxy != null) {

            if (mRadioVersion.greaterOrEqual(RADIO_HAL_VERSION_1_2)) {

                // We have a 1.2 or later radio, so the LCE 1.0 LCE service control is unused.

                // Instead the LCE functionality is always-on and provides unsolicited indications.
@@ -4213,7 +4215,6 @@ public class RIL extends BaseCommands implements CommandsInterface { 
                return;

            }



        if (radioProxy != null) {

            RILRequest rr = obtainRequest(RIL_REQUEST_STOP_LCE, result, mRILDefaultWorkSource);



            if (RILJ_LOGD) {