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

Commit 36bc8c8d authored by Brad Ebinger's avatar Brad Ebinger Committed by Automerger Merge Worker
Browse files

Merge changes from topic "cp_all_the_logs" am: 6882d65d 

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



Change-Id: I50eddcf66da43938d80dd9eff9881bfd6dfc5194
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 582f425e 6882d65d

src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -2644,6 +2644,9 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
            mPendingMO.finalize();

            mPendingMO.finalize();

            mPendingMO = null;

            mPendingMO = null;

        }

        }

        // Ensure aggregate state for this tracker is also updated to reflect the new state.

        updatePhoneState();

        mPhone.notifyPreciseCallStateChanged();

    }

    }





    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

tests/telephonytests/src/com/android/internal/telephony/imsphone/ImsPhoneCallTrackerTest.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -1568,11 +1568,14 @@ public class ImsPhoneCallTrackerTest extends TelephonyTest { 
        assertEquals(1, mCTUT.getConnections().size());

        assertEquals(1, mCTUT.getConnections().size());

        assertNotNull(mCTUT.getPendingMO());

        assertNotNull(mCTUT.getPendingMO());

        assertEquals(Call.State.DIALING, mCTUT.mForegroundCall.getState());

        assertEquals(Call.State.DIALING, mCTUT.mForegroundCall.getState());

        assertEquals(PhoneConstants.State.OFFHOOK, mCTUT.getState());





        mCTUT.cleanupAndRemoveConnection(conn);

        mCTUT.cleanupAndRemoveConnection(conn);

        assertEquals(0, mCTUT.getConnections().size());

        assertEquals(0, mCTUT.getConnections().size());

        assertNull(mCTUT.getPendingMO());

        assertNull(mCTUT.getPendingMO());

        assertEquals(Call.State.IDLE, mCTUT.mForegroundCall.getState());

        assertEquals(Call.State.IDLE, mCTUT.mForegroundCall.getState());



        assertEquals(PhoneConstants.State.IDLE, mCTUT.getState());

    }

    }





    private void sendCarrierConfigChanged() {

    private void sendCarrierConfigChanged() {