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

Commit eedf4f4e authored by yifan.bai's avatar yifan.bai Committed by Yifan Bai
Browse files

Fix oldMergedSS is altered to OUT_OF_SERVICE. 

When there is no ImsPhone, oldMergedSS is assigned to mSST.mSS.
This caused "oldMergedSS", "tss" and "mNewSS" point to same object.
And when mNewSS.setStateOutOfService() is called, oldMergedSS is
also set to OUT_OF_SERVICE.

Test: Build pass;
Test: Add log and check oldMergedSS value pass;
Test: atest FrameworksTelephonyTests:ServiceStateTrackerTest

Bug: 112714563
parent 4525f57f

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

+1 −1
Original line number Diff line number Diff line
@@ -2895,7 +2895,7 @@ public class ServiceStateTracker extends Handler { 
            mRejectCode = mNewRejectCode;

        }



        ServiceState oldMergedSS = mPhone.getServiceState();

        ServiceState oldMergedSS = new ServiceState(mPhone.getServiceState());



        // swap mSS and mNewSS to put new state in mSS

        ServiceState tss = mSS;