summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2014-11-04 11:27:19 -0800
committerAlan Viverette <alanv@google.com>2014-11-04 11:27:19 -0800
commit93cad8c4d41f2256d0bfaa455686acf8442d97ff (patch)
tree594fe165a0cfe44296422f0856b87e7913a01bdb
parent6f7fd0ba50ad15788a1378eb62ec7d8a78983051 (diff)
downloadframeworks_base-93cad8c4d41f2256d0bfaa455686acf8442d97ff.zip
frameworks_base-93cad8c4d41f2256d0bfaa455686acf8442d97ff.tar.gz
frameworks_base-93cad8c4d41f2256d0bfaa455686acf8442d97ff.tar.bz2
Pass surface insets from window attributes rather than params
Params only gets set in certain situations, whereas the actual window attributes always contain the correct surface insets. BUG: 18214798 Change-Id: Ib5236ccf3f120b26c5abc8671bf29cb3dc269186
-rw-r--r--core/java/android/view/ViewRootImpl.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index 6450146..e464e77 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -1746,8 +1746,8 @@ public final class ViewRootImpl implements ViewParent,
if (hwInitialized ||
mWidth != mAttachInfo.mHardwareRenderer.getWidth() ||
mHeight != mAttachInfo.mHardwareRenderer.getHeight()) {
- final Rect surfaceInsets = params != null ? params.surfaceInsets : null;
- mAttachInfo.mHardwareRenderer.setup(mWidth, mHeight, surfaceInsets);
+ mAttachInfo.mHardwareRenderer.setup(
+ mWidth, mHeight, mWindowAttributes.surfaceInsets);
if (!hwInitialized) {
mAttachInfo.mHardwareRenderer.invalidate(mSurface);
mFullRedrawNeeded = true;