diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
old mode 100644
new mode 100755
index 5b2a4527aa90d..a946e9ee588bb
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -1565,6 +1565,9 @@ public final class ViewRootImpl implements ViewParent,
                     // Our surface is gone
                     if (mAttachInfo.mHardwareRenderer != null &&
                             mAttachInfo.mHardwareRenderer.isEnabled()) {
+                        // Destroy hardware layers before hardware renderer is destroyed
+                        mAttachInfo.mHardwareRenderer.destroyHardwareResources(mView);
+
                         mAttachInfo.mHardwareRenderer.destroy(true);
                     }
                 } else if (surfaceGenerationId != mSurface.getGenerationId() &&