commit e420bd2635f94b80c361c79a287b43d6dbf557ff
author Nicolas Geoffray <ngeoffray@google.com> Thu Mar 10 18:34:29 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 10 18:34:29 2022 +0000
tree f55ae1f602a77b486f6230f3e03a9e4b5e46e791
parent ebddedfd9b4380607eed95decbe5178516bca976
parent 13f1f45e1e512117e5357e46759d15c0199b593c

Merge "Move GraphicsStatsService native method registration to zygote."

core/jni/AndroidRuntime.cpp

diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp
index 194002e..1601b47 100644
--- a/core/jni/AndroidRuntime.cpp
+++ b/core/jni/AndroidRuntime.cpp
@@ -1565,6 +1565,7 @@
         REG_JNI(register_android_graphics_classes),
         REG_JNI(register_android_graphics_BLASTBufferQueue),
         REG_JNI(register_android_graphics_GraphicBuffer),
+        REG_JNI(register_android_graphics_GraphicsStatsService),
         REG_JNI(register_android_graphics_SurfaceTexture),
         REG_JNI(register_android_database_CursorWindow),
         REG_JNI(register_android_database_SQLiteConnection),

services/core/jni/onload.cpp

diff --git a/services/core/jni/onload.cpp b/services/core/jni/onload.cpp
index 9d3edd6..07f0b87 100644
--- a/services/core/jni/onload.cpp
+++ b/services/core/jni/onload.cpp
@@ -103,7 +103,6 @@
     register_android_server_HardwarePropertiesManagerService(env);
     register_android_server_storage_AppFuse(env);
     register_android_server_SyntheticPasswordManager(env);
-    register_android_graphics_GraphicsStatsService(env);
     register_android_hardware_display_DisplayViewport(env);
     register_android_server_am_CachedAppOptimizer(env);
     register_android_server_am_LowMemDetector(env);