diff options
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/view/ViewRootImpl.java | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index 4f28a861057c..155bc0a429be 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -1457,8 +1457,10 @@ public final class ViewRootImpl implements ViewParent, if (mHardwareRendererObserver != null) { mAttachInfo.mThreadedRenderer.addObserver(mHardwareRendererObserver); } - addPrepareSurfaceControlForWebviewCallback(); - addASurfaceTransactionCallback(); + if (HardwareRenderer.isWebViewOverlaysEnabled()) { + addPrepareSurfaceControlForWebviewCallback(); + addASurfaceTransactionCallback(); + } mAttachInfo.mThreadedRenderer.setSurfaceControl(mSurfaceControl); } } @@ -7792,8 +7794,10 @@ public final class ViewRootImpl implements ViewParent, } } if (mAttachInfo.mThreadedRenderer != null) { - addPrepareSurfaceControlForWebviewCallback(); - addASurfaceTransactionCallback(); + if (HardwareRenderer.isWebViewOverlaysEnabled()) { + addPrepareSurfaceControlForWebviewCallback(); + addASurfaceTransactionCallback(); + } mAttachInfo.mThreadedRenderer.setSurfaceControl(mSurfaceControl); } } else { |