diff options
4 files changed, 0 insertions, 45 deletions
diff --git a/core/java/android/view/SurfaceControl.java b/core/java/android/view/SurfaceControl.java index 85a4f2035901..e4500611db9c 100644 --- a/core/java/android/view/SurfaceControl.java +++ b/core/java/android/view/SurfaceControl.java @@ -185,8 +185,6 @@ public final class SurfaceControl implements Parcelable { private static native void nativeSetGameContentType(IBinder displayToken, boolean on); private static native void nativeSetDisplayPowerMode( IBinder displayToken, int mode); - private static native void nativeDeferTransactionUntil(long transactionObj, long nativeObject, - long barrierObject, long frame); private static native void nativeReparent(long transactionObj, long nativeObject, long newParentNativeObject); @@ -3028,21 +3026,6 @@ public final class SurfaceControl implements Parcelable { } /** - * @hide - */ - @UnsupportedAppUsage - public Transaction deferTransactionUntil(SurfaceControl sc, SurfaceControl barrier, - long frameNumber) { - if (frameNumber < 0) { - return this; - } - checkPreconditions(sc); - nativeDeferTransactionUntil(mNativeObject, sc.mNativeObject, barrier.mNativeObject, - frameNumber); - return this; - } - - /** * Re-parents a given layer to a new parent. Children inherit transform (position, scaling) * crop, visibility, and Z-ordering from their parents, as if the children were pixels within the * parent Surface. diff --git a/core/jni/android_view_SurfaceControl.cpp b/core/jni/android_view_SurfaceControl.cpp index 906367b1fa94..b3427551ea7b 100644 --- a/core/jni/android_view_SurfaceControl.cpp +++ b/core/jni/android_view_SurfaceControl.cpp @@ -1443,14 +1443,6 @@ static jboolean nativeGetAnimationFrameStats(JNIEnv* env, jclass clazz, jobject return JNI_TRUE; } -static void nativeDeferTransactionUntil(JNIEnv* env, jclass clazz, jlong transactionObj, - jlong nativeObject, jlong barrierObject, jlong frameNumber) { - sp<SurfaceControl> ctrl = reinterpret_cast<SurfaceControl*>(nativeObject); - sp<SurfaceControl> barrier = reinterpret_cast<SurfaceControl*>(barrierObject); - auto transaction = reinterpret_cast<SurfaceComposerClient::Transaction*>(transactionObj); - transaction->deferTransactionUntil_legacy(ctrl, barrier, frameNumber); -} - static void nativeReparent(JNIEnv* env, jclass clazz, jlong transactionObj, jlong nativeObject, jlong newParentObject) { @@ -1856,8 +1848,6 @@ static const JNINativeMethod sSurfaceControlMethods[] = { (void*)nativeSetDisplayPowerMode }, {"nativeGetProtectedContentSupport", "()Z", (void*)nativeGetProtectedContentSupport }, - {"nativeDeferTransactionUntil", "(JJJJ)V", - (void*)nativeDeferTransactionUntil }, {"nativeReparent", "(JJJ)V", (void*)nativeReparent }, {"nativeCaptureDisplay", diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/system/TransactionCompat.java b/packages/SystemUI/shared/src/com/android/systemui/shared/system/TransactionCompat.java index fa2f32fee755..dc42a5382335 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/system/TransactionCompat.java +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/system/TransactionCompat.java @@ -92,23 +92,11 @@ public class TransactionCompat { return this; } - public TransactionCompat deferTransactionUntil(SurfaceControlCompat surfaceControl, - SurfaceControl barrier, long frameNumber) { - mTransaction.deferTransactionUntil(surfaceControl.mSurfaceControl, barrier, - frameNumber); - return this; - } - public TransactionCompat setColor(SurfaceControlCompat surfaceControl, float[] color) { mTransaction.setColor(surfaceControl.mSurfaceControl, color); return this; } - public static void deferTransactionUntil(Transaction t, SurfaceControl surfaceControl, - SurfaceControl barrier, long frameNumber) { - t.deferTransactionUntil(surfaceControl, barrier, frameNumber); - } - public static void setRelativeLayer(Transaction t, SurfaceControl surfaceControl, SurfaceControl relativeTo, int z) { t.setRelativeLayer(surfaceControl, relativeTo, z); diff --git a/services/tests/wmtests/src/com/android/server/wm/StubTransaction.java b/services/tests/wmtests/src/com/android/server/wm/StubTransaction.java index bb9e24fa6813..f3616da6c102 100644 --- a/services/tests/wmtests/src/com/android/server/wm/StubTransaction.java +++ b/services/tests/wmtests/src/com/android/server/wm/StubTransaction.java @@ -146,12 +146,6 @@ public class StubTransaction extends SurfaceControl.Transaction { } @Override - public SurfaceControl.Transaction deferTransactionUntil(SurfaceControl sc, - SurfaceControl barrier, long frameNumber) { - return this; - } - - @Override public SurfaceControl.Transaction reparent(SurfaceControl sc, SurfaceControl newParent) { return this; } |