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

Merge "Nudge SurfaceControlFpsListener api to use task ID" into sc-dev

Browse Source
This commit is contained in:
Yiwei Zhang
2021-03-07 03:44:19 +00:00
committed by Android (Google) Code Review
parent 50575cd126 2b54c82cc5
commit 83c17c18b8
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/view/SurfaceControlFpsListener.java
View File

@@ -57,14 +57,14 @@ public abstract class SurfaceControlFpsListener {
public abstract void onFpsReported(float fps); public abstract void onFpsReported(float fps);
/** /**
* Registers the sampling listener. * Registers the sampling listener for a particular task ID
*/ */
public void register(@NonNull SurfaceControl layer) { public void register(int taskId) {
if (mNativeListener == 0) { if (mNativeListener == 0) {
return; return;
} }
nativeRegister(mNativeListener, layer.mNativeObject); nativeRegister(mNativeListener, taskId);
} }
/** /**
@@ -82,12 +82,13 @@ public abstract class SurfaceControlFpsListener {
* *
* Called from native code on a binder thread. * Called from native code on a binder thread.
*/ */
private static void dispatchOnFpsReported(SurfaceControlFpsListener listener, float fps) { private static void dispatchOnFpsReported(
@NonNull SurfaceControlFpsListener listener, float fps) {
listener.onFpsReported(fps); listener.onFpsReported(fps);
} }
private static native long nativeCreate(SurfaceControlFpsListener thiz); private static native long nativeCreate(SurfaceControlFpsListener thiz);
private static native void nativeDestroy(long ptr); private static native void nativeDestroy(long ptr);
private static native void nativeRegister(long ptr, long layerObject); private static native void nativeRegister(long ptr, int taskId);
private static native void nativeUnregister(long ptr); private static native void nativeUnregister(long ptr);
} }

8
core/jni/android_view_SurfaceControlFpsListener.cpp
View File

@@ -84,11 +84,9 @@ void nativeDestroy(JNIEnv* env, jclass clazz, jlong ptr) {
listener->decStrong((void*)nativeCreate); listener->decStrong((void*)nativeCreate);
} }
void nativeRegister(JNIEnv* env, jclass clazz, jlong ptr, jlong layerObj) { void nativeRegister(JNIEnv* env, jclass clazz, jlong ptr, jint taskId) {
sp<SurfaceControlFpsListener> listener = reinterpret_cast<SurfaceControlFpsListener*>(ptr); sp<SurfaceControlFpsListener> listener = reinterpret_cast<SurfaceControlFpsListener*>(ptr);
auto layer = reinterpret_cast<SurfaceControl*>(layerObj); if (SurfaceComposerClient::addFpsListener(taskId, listener) != OK) {
sp<IBinder> layerHandle = layer != nullptr ? layer->getHandle() : nullptr;
if (SurfaceComposerClient::addFpsListener(layerHandle, listener) != OK) {
constexpr auto error_msg = "Couldn't addFpsListener"; constexpr auto error_msg = "Couldn't addFpsListener";
ALOGE(error_msg); ALOGE(error_msg);
jniThrowRuntimeException(env, error_msg); jniThrowRuntimeException(env, error_msg);
@@ -109,7 +107,7 @@ const JNINativeMethod gMethods[] = {
/* name, signature, funcPtr */ /* name, signature, funcPtr */
{"nativeCreate", "(Landroid/view/SurfaceControlFpsListener;)J", (void*)nativeCreate}, {"nativeCreate", "(Landroid/view/SurfaceControlFpsListener;)J", (void*)nativeCreate},
{"nativeDestroy", "(J)V", (void*)nativeDestroy}, {"nativeDestroy", "(J)V", (void*)nativeDestroy},
{"nativeRegister", "(JJ)V", (void*)nativeRegister}, {"nativeRegister", "(JI)V", (void*)nativeRegister},
{"nativeUnregister", "(J)V", (void*)nativeUnregister}}; {"nativeUnregister", "(J)V", (void*)nativeUnregister}};
} // namespace } // namespace

2
core/tests/coretests/src/android/view/SurfaceControlFpsListenerTest.java
View File

@@ -39,7 +39,7 @@ public class SurfaceControlFpsListenerTest {
} }
}; };
listener.register(new SurfaceControl()); listener.register(0);
listener.unregister(); listener.unregister();
} }