Merge "Deprecate WM APIs" into main (9d7d5a07) · Commits · e / os / android_frameworks_base

core/api/current.txt

+6 −6

Original line number	Diff line number	Diff line
		@@ -52193,7 +52193,7 @@ package android.view {
		method @FlaggedApi("com.android.window.flags.sdk_desired_present_time") @NonNull public android.view.SurfaceControl.Transaction addTransactionCompletedListener(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<android.view.SurfaceControl.TransactionStats>);
		method public void apply();
		method @NonNull public android.view.SurfaceControl.Transaction clearFrameRate(@NonNull android.view.SurfaceControl);
		method @NonNull public android.view.SurfaceControl.Transaction clearTrustedPresentationCallback(@NonNull android.view.SurfaceControl);
		method @Deprecated @NonNull public android.view.SurfaceControl.Transaction clearTrustedPresentationCallback(@NonNull android.view.SurfaceControl);
		method public void close();
		method public int describeContents();
		method @NonNull public android.view.SurfaceControl.Transaction merge(@NonNull android.view.SurfaceControl.Transaction);
		@@ -52218,7 +52218,7 @@ package android.view {
		method @NonNull public android.view.SurfaceControl.Transaction setOpaque(@NonNull android.view.SurfaceControl, boolean);
		method @NonNull public android.view.SurfaceControl.Transaction setPosition(@NonNull android.view.SurfaceControl, float, float);
		method @NonNull public android.view.SurfaceControl.Transaction setScale(@NonNull android.view.SurfaceControl, float, float);
		method @NonNull public android.view.SurfaceControl.Transaction setTrustedPresentationCallback(@NonNull android.view.SurfaceControl, @NonNull android.view.SurfaceControl.TrustedPresentationThresholds, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Boolean>);
		method @Deprecated @NonNull public android.view.SurfaceControl.Transaction setTrustedPresentationCallback(@NonNull android.view.SurfaceControl, @NonNull android.view.SurfaceControl.TrustedPresentationThresholds, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Boolean>);
		method @NonNull public android.view.SurfaceControl.Transaction setVisibility(@NonNull android.view.SurfaceControl, boolean);
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.view.SurfaceControl.Transaction> CREATOR;
		@@ -52233,8 +52233,8 @@ package android.view {
		method @FlaggedApi("com.android.window.flags.sdk_desired_present_time") @NonNull public android.hardware.SyncFence getPresentFence();
		}

		public static final class SurfaceControl.TrustedPresentationThresholds {
		ctor public SurfaceControl.TrustedPresentationThresholds(@FloatRange(from=0.0f, fromInclusive=false, to=1.0f) float, @FloatRange(from=0.0f, fromInclusive=false, to=1.0f) float, @IntRange(from=1) int);
		@Deprecated public static final class SurfaceControl.TrustedPresentationThresholds {
		ctor @Deprecated public SurfaceControl.TrustedPresentationThresholds(@FloatRange(from=0.0f, fromInclusive=false, to=1.0f) float, @FloatRange(from=0.0f, fromInclusive=false, to=1.0f) float, @IntRange(from=1) int);
		}

		@FlaggedApi("com.android.window.flags.surface_control_input_receiver") public interface SurfaceControlInputReceiver {
		@@ -52249,7 +52249,7 @@ package android.view {
		method public void relayout(int, int);
		method public void release();
		method public void setView(@NonNull android.view.View, int, int);
		method public boolean transferTouchGestureToHost();
		method @Deprecated public boolean transferTouchGestureToHost();
		}

		public static final class SurfaceControlViewHost.SurfacePackage implements android.os.Parcelable {
		@@ -52308,7 +52308,7 @@ package android.view {
		ctor public SurfaceView(android.content.Context, android.util.AttributeSet, int, int);
		method public void applyTransactionToFrame(@NonNull android.view.SurfaceControl.Transaction);
		method public android.view.SurfaceHolder getHolder();
		method @Nullable public android.os.IBinder getHostToken();
		method @Deprecated @Nullable public android.os.IBinder getHostToken();
		method public android.view.SurfaceControl getSurfaceControl();
		method public void setChildSurfacePackage(@NonNull android.view.SurfaceControlViewHost.SurfacePackage);
		method @FlaggedApi("com.android.graphics.hwui.flags.limited_hdr") public void setDesiredHdrHeadroom(@FloatRange(from=0.0f, to=10000.0) float);

core/java/android/view/SurfaceControl.java

+12 −2

Original line number	Diff line number	Diff line
		@@ -2631,7 +2631,10 @@ public final class SurfaceControl implements Parcelable {
		* Threshold values that are sent with
		* {@link Transaction#setTrustedPresentationCallback(SurfaceControl,
		* TrustedPresentationThresholds, Executor, Consumer)}
		*
		* @deprecated Use {@link android.window.TrustedPresentationThresholds} instead.
		*/
		@Deprecated
		public static final class TrustedPresentationThresholds {
		private final float mMinAlpha;
		private final float mMinFractionRendered;
		@@ -4451,7 +4454,6 @@ public final class SurfaceControl implements Parcelable {
		* <tr><td>o</td><td>x</td><td>x</td><td>x</td></tr>
		* </table>
		* </blockquote>
		*
		* <p>
		* We first start by computing fr=xscaleyscale=0.90.9=0.81, indicating
		* that "81%" of the pixels were rendered. This corresponds to what was 100
		@@ -4469,6 +4471,7 @@ public final class SurfaceControl implements Parcelable {
		* be somewhat arbitrary, and so there are some somewhat arbitrary decisions in
		* this API as well.
		* <p>
		*
		* @param sc The {@link SurfaceControl} to set the callback on
		* @param thresholds The {@link TrustedPresentationThresholds} that will specify when the to
		* invoke the callback.
		@@ -4477,7 +4480,11 @@ public final class SurfaceControl implements Parcelable {
		* exited the threshold.
		* @return This transaction
		* @see TrustedPresentationThresholds
		* @deprecated Use
		* {@link WindowManager#registerTrustedPresentationListener(IBinder,
		* android.window.TrustedPresentationThresholds, Executor, Consumer)} instead.
		*/
		@Deprecated
		@NonNull
		public Transaction setTrustedPresentationCallback(@NonNull SurfaceControl sc,
		@NonNull TrustedPresentationThresholds thresholds, @NonNull Executor executor,
		@@ -4506,7 +4513,10 @@ public final class SurfaceControl implements Parcelable {
		*
		* @param sc The SurfaceControl that the callback should be cleared from
		* @return This transaction
		* @deprecated Use {@link WindowManager#unregisterTrustedPresentationListener(Consumer)}
		* instead.
		*/
		@Deprecated
		@NonNull
		public Transaction clearTrustedPresentationCallback(@NonNull SurfaceControl sc) {
		checkPreconditions(sc);

core/java/android/view/SurfaceControlViewHost.java

+5 −2

Original line number	Diff line number	Diff line
		@@ -583,13 +583,16 @@ public class SurfaceControlViewHost {
		* associated host {@link InputTransferToken}.
		*
		* @return Whether the touch stream was transferred.
		* @deprecated Use {@link WindowManager#transferTouchGesture(InputTransferToken,
		* InputTransferToken)} instead.
		*/
		@Deprecated
		public boolean transferTouchGestureToHost() {
		if (mViewRoot == null) {
		return false;
		}
		final WindowManager wm =
		(WindowManager) mViewRoot.mContext.getSystemService(Context.WINDOW_SERVICE);
		final WindowManager wm = (WindowManager) mViewRoot.mContext.getSystemService(
		Context.WINDOW_SERVICE);
		InputTransferToken embeddedToken = getInputTransferToken();
		InputTransferToken hostToken = mWm.mHostInputTransferToken;
		if (embeddedToken == null \|\| hostToken == null) {

core/java/android/view/SurfaceView.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -1946,7 +1946,9 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall
		* be passed from the host process to the client process.
		*
		* @return The token
		* @deprecated Use {@link AttachedSurfaceControl#getInputTransferToken()} instead.
		*/
		@Deprecated
		public @Nullable IBinder getHostToken() {
		final ViewRootImpl viewRoot = getViewRootImpl();
		if (viewRoot == null) {