diff options
| author | Rob Carr <racarr@google.com> | 2018-04-23 19:22:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-04-23 19:22:18 +0000 |
| commit | cef96f69d7b6bc2c435db0905ee37b3a48f1c865 (patch) | |
| tree | ff0eab0144181dc332d4dd0d431a9e7e1bcbec1c /core/java | |
| parent | 7f352dbeaf3921286d996c07fcb038428d51c212 (diff) | |
| parent | 80923d5913f0cf42cf353a44fc533aa4936a1d6e (diff) | |
Merge "ViewRoot: Check Surface validity before initializing renderer from draw()." into pi-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/view/ViewRootImpl.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index 19ead600e2dc..4bd6fc8b665f 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -3272,7 +3272,8 @@ public final class ViewRootImpl implements ViewParent, // eglTerminate() for instance. if (mAttachInfo.mThreadedRenderer != null && !mAttachInfo.mThreadedRenderer.isEnabled() && - mAttachInfo.mThreadedRenderer.isRequested()) { + mAttachInfo.mThreadedRenderer.isRequested() && + mSurface.isValid()) { try { mAttachInfo.mThreadedRenderer.initializeIfNeeded( |