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

Commit 7522d056 authored by Massimo Carli's avatar Massimo Carli Committed by Android (Google) Code Review
Browse files

Merge "Fix NullPointerException in aspect ratio restrictions" into tm-qpr-dev

parents 451856db 02a99b8a

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

+4 −0
Original line number Diff line number Diff line
@@ -327,6 +327,10 @@ final class LetterboxUiController { 
            mLetterbox.destroy();

            mLetterbox = null;

        }

        if (mLetterboxConfigListener != null) {

            mLetterboxConfigListener.onRemoved();

            mLetterboxConfigListener = null;

        }

    }



    void onMovedToDisplay(int displayId) {

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

+21 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ import static com.android.internal.util.FrameworkStatsLog.APP_COMPAT_STATE_CHANG 
import static com.android.internal.util.FrameworkStatsLog.APP_COMPAT_STATE_CHANGED__STATE__LETTERBOXED_FOR_SIZE_COMPAT_MODE;

import static com.android.internal.util.FrameworkStatsLog.APP_COMPAT_STATE_CHANGED__STATE__NOT_LETTERBOXED;

import static com.android.internal.util.FrameworkStatsLog.APP_COMPAT_STATE_CHANGED__STATE__NOT_VISIBLE;

import static com.android.server.wm.ActivityRecord.State.DESTROYED;

import static com.android.server.wm.ActivityRecord.State.PAUSED;

import static com.android.server.wm.ActivityRecord.State.RESTARTING_PROCESS;

import static com.android.server.wm.ActivityRecord.State.RESUMED;
@@ -172,6 +173,26 @@ public class SizeCompatTests extends WindowTestsBase { 
        setUpApp(builder.build());

    }



    @Test

    public void testCleanLetterboxConfigListenerWhenTranslucentIsDestroyed() {

        mWm.mLetterboxConfiguration.setTranslucentLetterboxingOverrideEnabled(true);

        setUpDisplaySizeWithApp(2000, 1000);

        prepareUnresizable(mActivity, SCREEN_ORIENTATION_PORTRAIT);

        mActivity.mDisplayContent.setIgnoreOrientationRequest(true /* ignoreOrientationRequest */);

        // Translucent Activity

        final ActivityRecord translucentActivity = new ActivityBuilder(mAtm)

                .setLaunchedFromUid(mActivity.getUid())

                .setScreenOrientation(SCREEN_ORIENTATION_PORTRAIT)

                .build();

        doReturn(false).when(translucentActivity).fillsParent();

        mTask.addChild(translucentActivity);



        translucentActivity.setState(DESTROYED, "testing");

        translucentActivity.removeImmediately();



        assertFalse(translucentActivity.mLetterboxUiController.hasInheritedLetterboxBehavior());

    }



    @Test

    public void testHorizontalReachabilityEnabledForTranslucentActivities() {

        setUpDisplaySizeWithApp(2500, 1000);