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

Commit 67f3ba15 authored by Peiyong Lin's avatar Peiyong Lin
Browse files

Fix display freezing when screen size mismatches 

If we have a display size change, make sure to set different
scaling mode such that we can show the buffer even if there is
a size mismatch.

Cherry-pick from: ag/4841089

Test: Rotate screen
Test: Change cutout type
Bug: 112876936
Bug: 113077238
Change-Id: Iedc7774d69730a95b98ba46d4f274bc3b7e66bd1
parent d5796dd4

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

+8 −5
Original line number Diff line number Diff line
@@ -16,20 +16,18 @@ 


package com.android.server.wm;



import static com.android.server.wm.WindowManagerDebugConfig.SHOW_LIGHT_TRANSACTIONS;

import static com.android.server.wm.ScreenRotationAnimationProto.ANIMATION_RUNNING;

import static com.android.server.wm.ScreenRotationAnimationProto.STARTED;

import static com.android.server.wm.WindowManagerDebugConfig.SHOW_SURFACE_ALLOC;

import static com.android.server.wm.WindowManagerDebugConfig.SHOW_TRANSACTIONS;

import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME;

import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM;

import static com.android.server.wm.WindowManagerService.TYPE_LAYER_MULTIPLIER;

import static com.android.server.wm.WindowStateAnimator.WINDOW_FREEZE_LAYER;

import static com.android.server.wm.ScreenRotationAnimationProto.ANIMATION_RUNNING;

import static com.android.server.wm.ScreenRotationAnimationProto.STARTED;



import android.content.Context;

import android.graphics.Matrix;

import android.graphics.Rect;

import android.os.IBinder;

import android.util.Slog;

import android.util.proto.ProtoOutputStream;

import android.view.Display;
@@ -37,7 +35,6 @@ import android.view.DisplayInfo; 
import android.view.Surface;

import android.view.Surface.OutOfResourcesException;

import android.view.SurfaceControl;

import android.view.SurfaceSession;

import android.view.animation.Animation;

import android.view.animation.AnimationUtils;

import android.view.animation.Transformation;
@@ -268,6 +265,12 @@ class ScreenRotationAnimation { 
                    .setSecure(isSecure)

                    .build();



            // In case display bounds change, screenshot buffer and surface may mismatch so set a

            // scaling mode.

            SurfaceControl.Transaction t2 = new SurfaceControl.Transaction();

            t2.setOverrideScalingMode(mSurfaceControl, Surface.SCALING_MODE_SCALE_TO_WINDOW);

            t2.apply(true /* sync */);



            // Capture a screenshot into the surface we just created.

            final int displayId = display.getDisplayId();

            final Surface surface = new Surface();