summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Reck <jreck@android.com>2014-07-31 18:28:07 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-07-29 22:52:28 +0000
commit8c57cead83105ce273351024bfa745c979f9dc48 (patch)
treea955d86be749e3f4623667a97586fdc52a09c937
parent4895bf78ffd44ba076e4bc9805e43ce834f84b1e (diff)
parenta1997201903c44ae3de2ea827e2b801775b8984f (diff)
downloadbase-8c57cead83105ce273351024bfa745c979f9dc48.tar.gz
Merge "[View] Clear Hardware-Layers before system destroys HardwareRenderer​."
-rwxr-xr-x[-rw-r--r--]core/java/android/view/ViewRootImpl.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index 5b2a4527aa90..a946e9ee588b 100644..100755
--- 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() &&