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

Commit c7a24b81 authored Jan 12, 2025 by Treehugger Robot Committed by Automerger Merge Worker Jan 12, 2025

Merge "Fix typo" into main am: 98f0555d am: 170690ab

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3437899

Change-Id: I88ee4650217574627c6f5d5b75f753ed4e14bec6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 59fbf3ea 170690ab

core/java/android/view/SurfaceControl.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -4865,7 +4865,7 @@ public final class SurfaceControl implements Parcelable {
		/**
		* @hide
		*/
		public Transaction setDesintationFrame(SurfaceControl sc, @NonNull Rect destinationFrame) {
		public Transaction setDestinationFrame(SurfaceControl sc, @NonNull Rect destinationFrame) {
		checkPreconditions(sc);
		nativeSetDestinationFrame(mNativeObject, sc.mNativeObject,
		destinationFrame.left, destinationFrame.top, destinationFrame.right,
		@@ -4876,7 +4876,7 @@ public final class SurfaceControl implements Parcelable {
		/**
		* @hide
		*/
		public Transaction setDesintationFrame(SurfaceControl sc, int width, int height) {
		public Transaction setDestinationFrame(SurfaceControl sc, int width, int height) {
		checkPreconditions(sc);
		nativeSetDestinationFrame(mNativeObject, sc.mNativeObject, 0, 0, width, height);
		return this;

core/java/android/view/SurfaceView.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1125,7 +1125,7 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall
		}
		}

		surfaceUpdateTransaction.setDesintationFrame(mBlastSurfaceControl, mSurfaceWidth,
		surfaceUpdateTransaction.setDestinationFrame(mBlastSurfaceControl, mSurfaceWidth,
		mSurfaceHeight);

		if (isHardwareAccelerated()) {