diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-09-25 09:35:16 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2012-09-25 09:35:19 -0700 |
| commit | ec1996131d2e17408a22fd55fbc3edba5ea80d02 (patch) | |
| tree | dff2d2c31abe3abca11316618782616d38e32d29 /core/java | |
| parent | 7a7c6aa0c35d80145e163d9e637180d3be127441 (diff) | |
| parent | 8d0243a3d0269d3a57d90eb2e7b12b41f53b27d9 (diff) | |
| download | frameworks_base-ec1996131d2e17408a22fd55fbc3edba5ea80d02.zip frameworks_base-ec1996131d2e17408a22fd55fbc3edba5ea80d02.tar.gz frameworks_base-ec1996131d2e17408a22fd55fbc3edba5ea80d02.tar.bz2 | |
Merge into jb-mr1-dev
Change-Id: I97ff2551b36a1b590f2d314cabfcf198dd10f404
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/view/SurfaceView.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/view/SurfaceView.java b/core/java/android/view/SurfaceView.java index 973c7f6..3be63d5 100644 --- a/core/java/android/view/SurfaceView.java +++ b/core/java/android/view/SurfaceView.java @@ -456,11 +456,12 @@ public class SurfaceView extends View { } if (mWindow == null) { + Display display = getDisplay(); mWindow = new MyWindow(this); mLayout.type = mWindowType; mLayout.gravity = Gravity.START|Gravity.TOP; mSession.addToDisplayWithoutInputChannel(mWindow, mWindow.mSeq, mLayout, - mVisible ? VISIBLE : GONE, Display.DEFAULT_DISPLAY, mContentInsets); + mVisible ? VISIBLE : GONE, display.getDisplayId(), mContentInsets); } boolean realSizeChanged; |