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

Commit e5b8ef3a authored by Pierre Barbier de Reuille's avatar Pierre Barbier de Reuille
Browse files

On exiting PiP reset override to inherit values from parent 

Previously, we expicitely set the value to the parent's configuration.
If the parent's values changed (change of display or simply change of
density or resolution) this would be updated. This changes the code to
set the values as undefined in the override, so the value is inherited
from the parent.

Fix: 443262514
Flag: EXEMPT BUGFIX
Test: atest ActivityRecordTests
Test: Manual test
Change-Id: Id4a82e5988be55fbaca2dca1083bdb727ac66b80
parent 068427d1

services/core/java/com/android/server/wm/ActivityRecord.java

+4 −4
Original line number Original line Diff line number Diff line
@@ -7616,10 +7616,10 @@ final class ActivityRecord extends WindowToken { 
                    requestedOverrideConfig.densityDpi = lastReportedMergedConfig.densityDpi;

                    requestedOverrideConfig.densityDpi = lastReportedMergedConfig.densityDpi;

                }

                }

            } else {

            } else {

                // Update the configs if we're exiting PiP mode.

                // Reset the configs if we're exiting PiP mode.

                requestedOverrideConfig.colorMode = newParentConfiguration.colorMode;

                requestedOverrideConfig.colorMode = Configuration.COLOR_MODE_UNDEFINED;

                requestedOverrideConfig.touchscreen = newParentConfiguration.touchscreen;

                requestedOverrideConfig.touchscreen = Configuration.TOUCHSCREEN_UNDEFINED;

                requestedOverrideConfig.densityDpi = newParentConfiguration.densityDpi;

                requestedOverrideConfig.densityDpi = Configuration.DENSITY_DPI_UNDEFINED;

            }

            }

        }

        }

services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java

+21 −15
Original line number Original line Diff line number Diff line
@@ -3586,9 +3586,9 @@ public class ActivityRecordTests extends WindowTestsBase { 
        newConfig.colorMode = COLOR_MODE_WIDE_COLOR_GAMUT_YES;

        newConfig.colorMode = COLOR_MODE_WIDE_COLOR_GAMUT_YES;

        activity.resolveOverrideConfiguration(newConfig);

        activity.resolveOverrideConfiguration(newConfig);





        assertEquals(activity.getRequestedOverrideConfiguration().touchscreen, config.touchscreen);

        assertEquals(config.touchscreen, activity.getRequestedOverrideConfiguration().touchscreen);

        assertEquals(activity.getRequestedOverrideConfiguration().densityDpi, config.densityDpi);

        assertEquals(config.densityDpi, activity.getRequestedOverrideConfiguration().densityDpi);

        assertEquals(activity.getRequestedOverrideConfiguration().colorMode, config.colorMode);

        assertEquals(config.colorMode, activity.getRequestedOverrideConfiguration().colorMode);

    }

    }





    @Test

    @Test
@@ -3610,10 +3610,12 @@ public class ActivityRecordTests extends WindowTestsBase { 
        newConfig.colorMode = COLOR_MODE_WIDE_COLOR_GAMUT_YES;

        newConfig.colorMode = COLOR_MODE_WIDE_COLOR_GAMUT_YES;

        activity.resolveOverrideConfiguration(newConfig);

        activity.resolveOverrideConfiguration(newConfig);





        assertNotEquals(activity.getRequestedOverrideConfiguration().touchscreen,

        assertEquals(Configuration.TOUCHSCREEN_UNDEFINED,

                config.touchscreen);

                activity.getRequestedOverrideConfiguration().touchscreen);

        assertNotEquals(activity.getRequestedOverrideConfiguration().densityDpi, config.densityDpi);

        assertEquals(Configuration.DENSITY_DPI_UNDEFINED,

        assertNotEquals(activity.getRequestedOverrideConfiguration().colorMode, config.colorMode);

                activity.getRequestedOverrideConfiguration().densityDpi);

        assertEquals(Configuration.COLOR_MODE_UNDEFINED,

                activity.getRequestedOverrideConfiguration().colorMode);

    }

    }





    @Test

    @Test
@@ -3632,10 +3634,12 @@ public class ActivityRecordTests extends WindowTestsBase { 
        newConfig.colorMode = COLOR_MODE_WIDE_COLOR_GAMUT_YES;

        newConfig.colorMode = COLOR_MODE_WIDE_COLOR_GAMUT_YES;

        activity.resolveOverrideConfiguration(newConfig);

        activity.resolveOverrideConfiguration(newConfig);





        assertNotEquals(activity.getRequestedOverrideConfiguration().touchscreen,

        assertEquals(Configuration.TOUCHSCREEN_UNDEFINED,

                config.touchscreen);

                activity.getRequestedOverrideConfiguration().touchscreen);

        assertNotEquals(activity.getRequestedOverrideConfiguration().densityDpi, config.densityDpi);

        assertEquals(Configuration.DENSITY_DPI_UNDEFINED,

        assertNotEquals(activity.getRequestedOverrideConfiguration().colorMode, config.colorMode);

                activity.getRequestedOverrideConfiguration().densityDpi);

        assertEquals(Configuration.COLOR_MODE_UNDEFINED,

                activity.getRequestedOverrideConfiguration().colorMode);

    }

    }





    @Test

    @Test
@@ -3656,10 +3660,12 @@ public class ActivityRecordTests extends WindowTestsBase { 
        newConfig.colorMode = COLOR_MODE_WIDE_COLOR_GAMUT_YES;

        newConfig.colorMode = COLOR_MODE_WIDE_COLOR_GAMUT_YES;

        activity.resolveOverrideConfiguration(newConfig);

        activity.resolveOverrideConfiguration(newConfig);





        assertEquals(activity.getRequestedOverrideConfiguration().touchscreen,

        assertEquals(Configuration.TOUCHSCREEN_UNDEFINED,

                newConfig.touchscreen);

                activity.getRequestedOverrideConfiguration().touchscreen);

        assertEquals(activity.getRequestedOverrideConfiguration().densityDpi, newConfig.densityDpi);

        assertEquals(Configuration.DENSITY_DPI_UNDEFINED,

        assertEquals(activity.getRequestedOverrideConfiguration().colorMode, newConfig.colorMode);

                activity.getRequestedOverrideConfiguration().densityDpi);

        assertEquals(Configuration.COLOR_MODE_UNDEFINED,

                activity.getRequestedOverrideConfiguration().colorMode);

    }

    }





    private ActivityRecord setupDisplayAndActivityForCameraCompat(boolean isCameraRunning,

    private ActivityRecord setupDisplayAndActivityForCameraCompat(boolean isCameraRunning,