Merge "Don't make HardwareRenderer calls in the finalizer"

2 files changed, 1 insertions, 1 deletions

diff --git a/core/java/android/view/RenderNode.java b/core/java/android/view/RenderNode.java
index 26eaef816f5f..78ddf5b39af7 100644
--- a/core/java/android/view/RenderNode.java
+++ b/core/java/android/view/RenderNode.java
@@ -909,7 +909,6 @@ public class RenderNode {
     @Override
     protected void finalize() throws Throwable {
         try {
-            destroyDisplayListData();
             nDestroyDisplayList(mNativeDisplayList);
         } finally {
             super.finalize();
diff --git a/core/java/android/view/ThreadedRenderer.java b/core/java/android/view/ThreadedRenderer.java
index 3d143d777fd1..a747ab601eab 100644
--- a/core/java/android/view/ThreadedRenderer.java
+++ b/core/java/android/view/ThreadedRenderer.java
@@ -253,6 +253,7 @@ public class ThreadedRenderer extends HardwareRenderer {
     protected void finalize() throws Throwable {
         try {
             nDeleteProxy(mNativeProxy);
+            mNativeProxy = 0;
         } finally {
             super.finalize();
         }