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

Merge "Expose transaction id" into tm-qpr-dev am: e58a36c1c3

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18799654

Change-Id: I5df72b9e9b2c9db416157067ef7c14ac536ec795
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Pablo Gamito
2022-06-14 16:06:42 +00:00
committed by Automerger Merge Worker
parent 8dcdba87af e58a36c1c3
commit 77ec5b8c3d
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -121,6 +121,7 @@ public final class SurfaceControl implements Parcelable {
private static native void nativeSetAnimationTransaction(long transactionObj); private static native void nativeSetAnimationTransaction(long transactionObj);
private static native void nativeSetEarlyWakeupStart(long transactionObj); private static native void nativeSetEarlyWakeupStart(long transactionObj);
private static native void nativeSetEarlyWakeupEnd(long transactionObj); private static native void nativeSetEarlyWakeupEnd(long transactionObj);
private static native long nativeGetTransactionId(long transactionObj);
private static native void nativeSetLayer(long transactionObj, long nativeObject, int zorder); private static native void nativeSetLayer(long transactionObj, long nativeObject, int zorder);
private static native void nativeSetRelativeLayer(long transactionObj, long nativeObject, private static native void nativeSetRelativeLayer(long transactionObj, long nativeObject,
@@ -3536,6 +3537,15 @@ public final class SurfaceControl implements Parcelable {
return this; return this;
} }
/**
* @hide
* @return The transaction's current id.
* The id changed every time the transaction is applied.
*/
public long getId() {
return nativeGetTransactionId(mNativeObject);
}
/** /**
* Sets an arbitrary piece of metadata on the surface. This is a helper for int data. * Sets an arbitrary piece of metadata on the surface. This is a helper for int data.
* @hide * @hide

7
core/jni/android_view_SurfaceControl.cpp
View File

@@ -580,6 +580,11 @@ static void nativeSetEarlyWakeupEnd(JNIEnv* env, jclass clazz, jlong transaction
transaction->setEarlyWakeupEnd(); transaction->setEarlyWakeupEnd();
} }
static jlong nativeGetTransactionId(JNIEnv* env, jclass clazz, jlong transactionObj) {
auto transaction = reinterpret_cast<SurfaceComposerClient::Transaction*>(transactionObj);
return transaction->getId();
}
static void nativeSetLayer(JNIEnv* env, jclass clazz, jlong transactionObj, static void nativeSetLayer(JNIEnv* env, jclass clazz, jlong transactionObj,
jlong nativeObject, jint zorder) { jlong nativeObject, jint zorder) {
auto transaction = reinterpret_cast<SurfaceComposerClient::Transaction*>(transactionObj); auto transaction = reinterpret_cast<SurfaceComposerClient::Transaction*>(transactionObj);
@@ -2103,6 +2108,8 @@ static const JNINativeMethod sSurfaceControlMethods[] = {
(void*)nativeSetEarlyWakeupStart }, (void*)nativeSetEarlyWakeupStart },
{"nativeSetEarlyWakeupEnd", "(J)V", {"nativeSetEarlyWakeupEnd", "(J)V",
(void*)nativeSetEarlyWakeupEnd }, (void*)nativeSetEarlyWakeupEnd },
{"nativeGetTransactionId", "(J)J",
(void*)nativeGetTransactionId },
{"nativeSetLayer", "(JJI)V", {"nativeSetLayer", "(JJI)V",
(void*)nativeSetLayer }, (void*)nativeSetLayer },
{"nativeSetRelativeLayer", "(JJJI)V", {"nativeSetRelativeLayer", "(JJJI)V",