summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorRobert Carr <racarr@google.com>2022-04-05 22:31:11 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-04-05 22:31:11 +0000
commit05f5f504bc34774b33bf8a7bb62cd7eaf38e7fca (patch)
treee30bcd53843ad250472be6c9c863b0820b3dc149 /core/java
parentcf608908b385310c9ea92e430fe65de6e36f52f9 (diff)
parentc54faf3e691b3d952f649756578eab6f8a5d3208 (diff)
DO NOT MERGE: WM: Call Transaction#sanitize am: c54faf3e69
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16812184 Change-Id: Icbd17c0b53d136b043fd6a85607f15cefb6c33a8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/view/SurfaceControl.java10
1 files changed, 9 insertions, 1 deletions
diff --git a/core/java/android/view/SurfaceControl.java b/core/java/android/view/SurfaceControl.java
index 4dc9807aca5d..1e290920b00b 100644
--- a/core/java/android/view/SurfaceControl.java
+++ b/core/java/android/view/SurfaceControl.java
@@ -239,6 +239,7 @@ public final class SurfaceControl implements Parcelable {
private static native int nativeGetGPUContextPriority();
private static native void nativeSetTransformHint(long nativeObject, int transformHint);
private static native int nativeGetTransformHint(long nativeObject);
+ private static native void nativeSanitize(long transactionObject);
@Nullable
@GuardedBy("mLock")
@@ -3439,7 +3440,14 @@ public final class SurfaceControl implements Parcelable {
return this;
}
- /**
+ /**
+ * @hide
+ */
+ public void sanitize() {
+ nativeSanitize(mNativeObject);
+ }
+
+ /**
* Merge the other transaction into this transaction, clearing the
* other transaction as if it had been applied.
*