Only destroy remote graphic buffers

Bug #9795157

Change-Id: Ia7a39d3ef40994fede185482a5b4ca5500249b34

1 files changed, 7 insertions, 2 deletions

diff --git a/core/java/android/view/HardwareRenderer.java b/core/java/android/view/HardwareRenderer.java
index d9e4600d42db..ba64f6bfd563 100644
--- a/core/java/android/view/HardwareRenderer.java
+++ b/core/java/android/view/HardwareRenderer.java
@@ -1983,7 +1983,12 @@ public abstract class HardwareRenderer {
                         if (map != null) {
                             GLES20Canvas.initAtlas(buffer, map);
                         }
-                        buffer.destroy();
+                        // If IAssetAtlas is not the same class as the IBinder
+                        // we are using a remote service and we can safely
+                        // destroy the graphic buffer
+                        if (atlas.getClass() != binder.getClass()) {
+                            buffer.destroy();
+                        }
                     }
                 }
             } catch (RemoteException e) {
@@ -1994,7 +1999,7 @@ public abstract class HardwareRenderer {
         @Override
         boolean canDraw() {
             return super.canDraw() && mGlCanvas != null;
-        }                
+        }
 
         @Override
         int onPreDraw(Rect dirty) {