Merge "[View] Clear Hardware-Layers before system destroys HardwareRenderer."

2014-07-31 18:28:07 +00:00
parent 4895bf78ff a199720190
commit 8c57cead83
1 changed files with 3 additions and 0 deletions
--- 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() &&