Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove deferTransactionUntil" into sc-dev

Browse Source
This commit is contained in:
Rob Carr
2021-04-13 19:47:24 +00:00
committed by Android (Google) Code Review
parent f8f0b73025 c07e9b2140
commit 211bf19cca
4 changed files with 0 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/java/android/view/SurfaceControl.java
View File

@@ -185,8 +185,6 @@ public final class SurfaceControl implements Parcelable {
private static native void nativeSetGameContentType(IBinder displayToken, boolean on); private static native void nativeSetGameContentType(IBinder displayToken, boolean on);
private static native void nativeSetDisplayPowerMode( private static native void nativeSetDisplayPowerMode(
IBinder displayToken, int mode); 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, private static native void nativeReparent(long transactionObj, long nativeObject,
long newParentNativeObject); long newParentNativeObject);
@@ -3027,21 +3025,6 @@ public final class SurfaceControl implements Parcelable {
return this; return this;
} }
/**
* @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) * 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 * crop, visibility, and Z-ordering from their parents, as if the children were pixels within the

10
core/jni/android_view_SurfaceControl.cpp
View File

@@ -1443,14 +1443,6 @@ static jboolean nativeGetAnimationFrameStats(JNIEnv* env, jclass clazz, jobject
return JNI_TRUE; 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, static void nativeReparent(JNIEnv* env, jclass clazz, jlong transactionObj,
jlong nativeObject, jlong nativeObject,
jlong newParentObject) { jlong newParentObject) {
@@ -1856,8 +1848,6 @@ static const JNINativeMethod sSurfaceControlMethods[] = {
(void*)nativeSetDisplayPowerMode }, (void*)nativeSetDisplayPowerMode },
{"nativeGetProtectedContentSupport", "()Z", {"nativeGetProtectedContentSupport", "()Z",
(void*)nativeGetProtectedContentSupport }, (void*)nativeGetProtectedContentSupport },
{"nativeDeferTransactionUntil", "(JJJJ)V",
(void*)nativeDeferTransactionUntil },
{"nativeReparent", "(JJJ)V", {"nativeReparent", "(JJJ)V",
(void*)nativeReparent }, (void*)nativeReparent },
{"nativeCaptureDisplay", {"nativeCaptureDisplay",

12
packages/SystemUI/shared/src/com/android/systemui/shared/system/TransactionCompat.java
View File

@@ -92,23 +92,11 @@ public class TransactionCompat {
return this; 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) { public TransactionCompat setColor(SurfaceControlCompat surfaceControl, float[] color) {
mTransaction.setColor(surfaceControl.mSurfaceControl, color); mTransaction.setColor(surfaceControl.mSurfaceControl, color);
return this; 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, public static void setRelativeLayer(Transaction t, SurfaceControl surfaceControl,
SurfaceControl relativeTo, int z) { SurfaceControl relativeTo, int z) {
t.setRelativeLayer(surfaceControl, relativeTo, z); t.setRelativeLayer(surfaceControl, relativeTo, z);

6
services/tests/wmtests/src/com/android/server/wm/StubTransaction.java
View File

@@ -145,12 +145,6 @@ public class StubTransaction extends SurfaceControl.Transaction {
return this; return this;
} }
@Override
public SurfaceControl.Transaction deferTransactionUntil(SurfaceControl sc,
SurfaceControl barrier, long frameNumber) {
return this;
}
@Override @Override
public SurfaceControl.Transaction reparent(SurfaceControl sc, SurfaceControl newParent) { public SurfaceControl.Transaction reparent(SurfaceControl sc, SurfaceControl newParent) {
return this; return this;