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

Commit fb4084bc authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "User Robot pattern in AppCompatCameraDisplayRotationPolicyTests." into main

parents caec868d 6ed8396a

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

+2 −3
Original line number Diff line number Diff line
@@ -356,15 +356,14 @@ final class AppCompatCameraDisplayRotationPolicy implements AppCompatCameraState 


        // Checking whether an activity in fullscreen rather than the task as this camera

        // compat treatment doesn't cover activity embedding.

        if (cameraActivity != null

                && cameraActivity.getWindowingMode() == WINDOWING_MODE_FULLSCREEN) {

        if (cameraActivity.getWindowingMode() == WINDOWING_MODE_FULLSCREEN) {

            recomputeConfigurationForCameraCompatIfNeeded(cameraActivity);

            mDisplayContent.updateOrientation();

            return;

        }

        // Checking that the whole app is in multi-window mode as we shouldn't show toast

        // for the activity embedding case.

        if (cameraTask.getWindowingMode() == WINDOWING_MODE_MULTI_WINDOW

        if (cameraActivity.getWindowingMode() == WINDOWING_MODE_MULTI_WINDOW

                && isTreatmentEnabledForActivity(cameraActivity, /* mustBeFullscreen */ false)) {

            final PackageManager packageManager = mWmService.mContext.getPackageManager();

            try {

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

+488 −405

File changed.

Preview size limit exceeded, changes collapsed.