summaryrefslogtreecommitdiff
path: root/graphics/java
diff options
context:
space:
mode:
authorHuihong Luo <huisinro@google.com>2021-06-17 16:32:06 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2021-06-17 16:32:06 +0000
commitfec5e82e69b8cd0f14f27e262deafa645f1eddea (patch)
treee083787102143f62354a402a236a1a7b34171d3c /graphics/java
parent255565b20cfa8254236eb863fc8d659623314ac1 (diff)
parent1d88151a380c2a8f102c76b8413d17989215ccf8 (diff)
Merge "Fix potential ASurfaceTransactionCallback leaks" into sc-dev
Diffstat (limited to 'graphics/java')
-rw-r--r--graphics/java/android/graphics/HardwareRenderer.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/graphics/java/android/graphics/HardwareRenderer.java b/graphics/java/android/graphics/HardwareRenderer.java
index 954d062b55e9..6aa74cb415f9 100644
--- a/graphics/java/android/graphics/HardwareRenderer.java
+++ b/graphics/java/android/graphics/HardwareRenderer.java
@@ -753,8 +753,12 @@ public class HardwareRenderer {
nCancelLayerUpdate(mNativeProxy, layer.getDeferredLayerUpdater());
}
+ private ASurfaceTransactionCallback mASurfaceTransactionCallback;
+
/** @hide */
public void setASurfaceTransactionCallback(ASurfaceTransactionCallback callback) {
+ // ensure callback is kept alive on the java side since weak ref is used in native code
+ mASurfaceTransactionCallback = callback;
nSetASurfaceTransactionCallback(mNativeProxy, callback);
}