From 0a1bc33851046eef747dc8d018c6fe5d67268899 Mon Sep 17 00:00:00 2001 From: Ady Abraham Date: Mon, 15 Mar 2021 16:14:29 -0700 Subject: [PATCH 1/2] Remove ISurfaceComposer::eEarlyWakeup The flag is deprecated. Bug: 159125966 Test: build Change-Id: Idc68ac200944a8ba9ce966faa5c9ffb2b5e5a5ea --- core/java/android/view/SurfaceControl.java | 18 ------------------ core/jni/android_view_SurfaceControl.cpp | 7 ------- .../shared/system/TransactionCompat.java | 9 --------- .../server/wm/LocalAnimationAdapter.java | 2 +- .../com/android/server/wm/StubTransaction.java | 5 ----- 5 files changed, 1 insertion(+), 40 deletions(-) diff --git a/core/java/android/view/SurfaceControl.java b/core/java/android/view/SurfaceControl.java index 03dd100507240..44b0caf1317ef 100644 --- a/core/java/android/view/SurfaceControl.java +++ b/core/java/android/view/SurfaceControl.java @@ -105,7 +105,6 @@ public final class SurfaceControl implements Parcelable { private static native void nativeMergeTransaction(long transactionObj, long otherTransactionObj); private static native void nativeSetAnimationTransaction(long transactionObj); - private static native void nativeSetEarlyWakeup(long transactionObj); private static native void nativeSetEarlyWakeupStart(long transactionObj); private static native void nativeSetEarlyWakeupEnd(long transactionObj); @@ -3137,23 +3136,6 @@ public final class SurfaceControl implements Parcelable { return this; } - /** - * @deprecated use {@link Transaction#setEarlyWakeupStart()} - * - * Indicate that SurfaceFlinger should wake up earlier than usual as a result of this - * transaction. This should be used when the caller thinks that the scene is complex enough - * that it's likely to hit GL composition, and thus, SurfaceFlinger needs to more time in - * order not to miss frame deadlines. - *

- * Corresponds to setting ISurfaceComposer::eEarlyWakeup - * @hide - */ - @Deprecated - public Transaction setEarlyWakeup() { - nativeSetEarlyWakeup(mNativeObject); - return this; - } - /** * Provides a hint to SurfaceFlinger to change its offset so that SurfaceFlinger wakes up * earlier to compose surfaces. The caller should use this as a hint to SurfaceFlinger diff --git a/core/jni/android_view_SurfaceControl.cpp b/core/jni/android_view_SurfaceControl.cpp index cbf4481bd2f1d..ab1419c7843f5 100644 --- a/core/jni/android_view_SurfaceControl.cpp +++ b/core/jni/android_view_SurfaceControl.cpp @@ -498,11 +498,6 @@ static void nativeSetAnimationTransaction(JNIEnv* env, jclass clazz, jlong trans transaction->setAnimationTransaction(); } -static void nativeSetEarlyWakeup(JNIEnv* env, jclass clazz, jlong transactionObj) { - auto transaction = reinterpret_cast(transactionObj); - transaction->setEarlyWakeup(); -} - static void nativeSetEarlyWakeupStart(JNIEnv* env, jclass clazz, jlong transactionObj) { auto transaction = reinterpret_cast(transactionObj); transaction->setExplicitEarlyWakeupStart(); @@ -1731,8 +1726,6 @@ static const JNINativeMethod sSurfaceControlMethods[] = { (void*)nativeMergeTransaction }, {"nativeSetAnimationTransaction", "(J)V", (void*)nativeSetAnimationTransaction }, - {"nativeSetEarlyWakeup", "(J)V", - (void*)nativeSetEarlyWakeup }, {"nativeSetEarlyWakeupStart", "(J)V", (void*)nativeSetEarlyWakeupStart }, {"nativeSetEarlyWakeupEnd", "(J)V", 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 255fffdb32919..fa2f32fee755f 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 @@ -99,11 +99,6 @@ public class TransactionCompat { return this; } - @Deprecated - public TransactionCompat setEarlyWakeup() { - return this; - } - public TransactionCompat setColor(SurfaceControlCompat surfaceControl, float[] color) { mTransaction.setColor(surfaceControl.mSurfaceControl, color); return this; @@ -118,8 +113,4 @@ public class TransactionCompat { SurfaceControl relativeTo, int z) { t.setRelativeLayer(surfaceControl, relativeTo, z); } - - @Deprecated - public static void setEarlyWakeup(Transaction t) { - } } diff --git a/services/core/java/com/android/server/wm/LocalAnimationAdapter.java b/services/core/java/com/android/server/wm/LocalAnimationAdapter.java index f0629fa953fc1..520bd8b2108e2 100644 --- a/services/core/java/com/android/server/wm/LocalAnimationAdapter.java +++ b/services/core/java/com/android/server/wm/LocalAnimationAdapter.java @@ -126,7 +126,7 @@ class LocalAnimationAdapter implements AnimationAdapter { /** * @return {@code true} if we need to wake-up SurfaceFlinger earlier during this animation. * - * @see Transaction#setEarlyWakeup + * @see Transaction#setEarlyWakeupStart and Transaction#setEarlyWakeupEnd */ default boolean needsEarlyWakeup() { return false; } 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 6c722499da4b0..bb9e24fa6813a 100644 --- a/services/tests/wmtests/src/com/android/server/wm/StubTransaction.java +++ b/services/tests/wmtests/src/com/android/server/wm/StubTransaction.java @@ -197,11 +197,6 @@ public class StubTransaction extends SurfaceControl.Transaction { return this; } - @Override - public SurfaceControl.Transaction setEarlyWakeup() { - return this; - } - @Override public SurfaceControl.Transaction setMetadata(SurfaceControl sc, int key, int data) { return this; From 5f1255f16a2e195b2beab165ef0d46c17f0d6cd0 Mon Sep 17 00:00:00 2001 From: Ady Abraham Date: Mon, 15 Mar 2021 16:40:07 -0700 Subject: [PATCH 2/2] rename ExplicitEarlyWakeup -> EarlyWakeup Bug: 159125966 Test: build Change-Id: Iece9c9f59ca62343a88b1a2e8276c118b8d66b72 --- core/jni/android_view_SurfaceControl.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/jni/android_view_SurfaceControl.cpp b/core/jni/android_view_SurfaceControl.cpp index ab1419c7843f5..90cbb052a7291 100644 --- a/core/jni/android_view_SurfaceControl.cpp +++ b/core/jni/android_view_SurfaceControl.cpp @@ -500,12 +500,12 @@ static void nativeSetAnimationTransaction(JNIEnv* env, jclass clazz, jlong trans static void nativeSetEarlyWakeupStart(JNIEnv* env, jclass clazz, jlong transactionObj) { auto transaction = reinterpret_cast(transactionObj); - transaction->setExplicitEarlyWakeupStart(); + transaction->setEarlyWakeupStart(); } static void nativeSetEarlyWakeupEnd(JNIEnv* env, jclass clazz, jlong transactionObj) { auto transaction = reinterpret_cast(transactionObj); - transaction->setExplicitEarlyWakeupEnd(); + transaction->setEarlyWakeupEnd(); } static void nativeSetLayer(JNIEnv* env, jclass clazz, jlong transactionObj,