Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use legacy layer name for screenshot shell display rotation" into tm-qpr-dev am: 1a27751cf7

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19928105

Change-Id: I857b1cdb90b4f130929bb66d8b44fe69c12184f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Riddle Hsu
2022-09-13 10:20:04 +00:00
committed by Automerger Merge Worker
parent d33472eeae 1a27751cf7
commit 3decda913b
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/wm/Transition.java
View File

@@ -2155,8 +2155,12 @@ class Transition extends Binder implements BLASTSyncEngine.TransactionReadyListe
Slog.w(TAG, "Failed to capture screenshot for " + wc); Slog.w(TAG, "Failed to capture screenshot for " + wc);
return false; return false;
} }
final boolean isDisplayRotation = wc.asDisplayContent() != null
&& wc.asDisplayContent().isRotationChanging();
// Some tests may check the name "RotationLayer" to detect display rotation.
final String name = isDisplayRotation ? "RotationLayer" : "transition snapshot: " + wc;
SurfaceControl snapshotSurface = wc.makeAnimationLeash() SurfaceControl snapshotSurface = wc.makeAnimationLeash()
.setName("transition snapshot: " + wc.toString()) .setName(name)
.setOpaque(true) .setOpaque(true)
.setParent(wc.getSurfaceControl()) .setParent(wc.getSurfaceControl())
.setSecure(screenshotBuffer.containsSecureLayers()) .setSecure(screenshotBuffer.containsSecureLayers())
@@ -2166,9 +2170,8 @@ class Transition extends Binder implements BLASTSyncEngine.TransactionReadyListe
mFrozen.add(wc); mFrozen.add(wc);
final ChangeInfo changeInfo = Objects.requireNonNull(mChanges.get(wc)); final ChangeInfo changeInfo = Objects.requireNonNull(mChanges.get(wc));
changeInfo.mSnapshot = snapshotSurface; changeInfo.mSnapshot = snapshotSurface;
if (wc.asDisplayContent() != null) { if (isDisplayRotation) {
// This isn't cheap, so only do it for rotations: assume display-level is rotate // This isn't cheap, so only do it for display rotations.
// since most of the time it is.
changeInfo.mSnapshotLuma = RotationAnimationUtils.getMedianBorderLuma( changeInfo.mSnapshotLuma = RotationAnimationUtils.getMedianBorderLuma(
screenshotBuffer.getHardwareBuffer(), screenshotBuffer.getColorSpace()); screenshotBuffer.getHardwareBuffer(), screenshotBuffer.getColorSpace());
} }