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

Commit e2e20f2d authored by Grant Menke's avatar Grant Menke Committed by Automerger Merge Worker
Browse files

Prevent exit car mode from clearing projection entry. am: 065ebfb9 am: ac3a1051 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/21612460



Change-Id: I7a8c573f391bb24900d2b369673e49de306b4e7f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cce71ee4 ac3a1051

src/com/android/server/telecom/CarModeTracker.java

+3 −1
Original line number Diff line number Diff line
@@ -150,7 +150,9 @@ public class CarModeTracker { 
        Log.i(this, "handleExitCarMode: packageName=%s, priority=%d", packageName, priority);

        mCarModeChangeLog.log("exitCarMode: packageName=" + packageName + ", priority="

                + priority);

        mCarModeApps.removeIf(c -> c.getPriority() == priority);



        //Remove the car mode app with specified priority without clearing out the projection entry.

        mCarModeApps.removeIf(c -> c.getPriority() == priority && !c.hasSetAutomotiveProjection());

    }



    public void handleSetAutomotiveProjection(@NonNull String packageName) {

tests/src/com/android/server/telecom/tests/CarModeTrackerTest.java

+22 −0
Original line number Diff line number Diff line
@@ -235,6 +235,28 @@ public class CarModeTrackerTest extends TelecomTestCase { 
        assertTrue(mCarModeTracker.isInCarMode());

    }



    /**

     * Verifies that setting automotive projection overrides entering car mode with the highest

     * priority of 0. Also ensures exiting car mode doesn't interfere with the automotive

     * projection being set.

     */

    @Test

    public void testInterleaveCarModeAndProjectionMode() {

        mCarModeTracker.handleEnterCarMode(0, CAR_MODE_APP1_PACKAGE_NAME);

        assertEquals(CAR_MODE_APP1_PACKAGE_NAME, mCarModeTracker.getCurrentCarModePackage());

        assertTrue(mCarModeTracker.isInCarMode());



        mCarModeTracker.handleSetAutomotiveProjection(CAR_MODE_APP2_PACKAGE_NAME);

        assertEquals(CAR_MODE_APP2_PACKAGE_NAME, mCarModeTracker.getCurrentCarModePackage());

        assertTrue(mCarModeTracker.isInCarMode());



        mCarModeTracker.handleExitCarMode(0, CAR_MODE_APP1_PACKAGE_NAME);

        assertEquals(CAR_MODE_APP2_PACKAGE_NAME, mCarModeTracker.getCurrentCarModePackage());

        assertTrue(mCarModeTracker.isInCarMode());



        mCarModeTracker.handleReleaseAutomotiveProjection();

    }



    /**

     * Verifies that if we set automotive projection more than once with the same package, nothing

     * changes.