From 9464a670a47cf156971b2b06a886826504105d0c Mon Sep 17 00:00:00 2001
From: Jorim Jaggi <jjaggi@google.com>
Date: Tue, 23 Mar 2021 19:05:52 +0100
Subject: [PATCH] Do not leak objects created from JNI

Test: Boots
Bug: 181752372
Change-Id: Ia587da63c637262867bee17b4fc842a917d0d97d
---
 core/jni/android_view_SurfaceControl.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/jni/android_view_SurfaceControl.cpp b/core/jni/android_view_SurfaceControl.cpp
index 7a3366acce27a..d1e21c033c347 100644
--- a/core/jni/android_view_SurfaceControl.cpp
+++ b/core/jni/android_view_SurfaceControl.cpp
@@ -1640,10 +1640,12 @@ public:
             jobject jJankData = env->NewObject(gJankDataClassInfo.clazz,
                     gJankDataClassInfo.ctor, jankData[i].frameVsyncId, jankData[i].jankType);
             env->SetObjectArrayElement(jJankDataArray, i, jJankData);
+            env->DeleteLocalRef(jJankData);
         }
         env->CallVoidMethod(target,
                 gJankDataListenerClassInfo.onJankDataAvailable,
                 jJankDataArray);
+        env->DeleteLocalRef(jJankDataArray);
         env->DeleteLocalRef(target);
     }