Fix surface view on secondary display.

Jeff Brown · Jeff Brown · commit 8d0243a3d026 · 2012-09-24T15:02:15.000-07:00
Bug: 7183618
Change-Id: I8d743b5db8f362afb97f720846d990f9a722b3bd
diff --git a/core/java/android/view/SurfaceView.java b/core/java/android/view/SurfaceView.java
@@ -456,11 +456,12 @@ private void updateWindow(boolean force, boolean redrawNeeded) {
                 }
 
                 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;

Original file line number	Diff line number	Diff line change
`@@ -456,11 +456,12 @@ private void updateWindow(boolean force, boolean redrawNeeded) {`
`456`	`456`	`}`
`457`	`457`
`458`	`458`	`if (mWindow == null) {`
	`459`	`+ Display display = getDisplay();`
`459`	`460`	`mWindow = new MyWindow(this);`
`460`	`461`	`mLayout.type = mWindowType;`
`461`	`462`	`mLayout.gravity = Gravity.START\|Gravity.TOP;`
`462`	`463`	`mSession.addToDisplayWithoutInputChannel(mWindow, mWindow.mSeq, mLayout,`
`463`		`- mVisible ? VISIBLE : GONE, Display.DEFAULT_DISPLAY, mContentInsets);`
	`464`	`+ mVisible ? VISIBLE : GONE, display.getDisplayId(), mContentInsets);`
`464`	`465`	`}`
`465`	`466`
`466`	`467`	`boolean realSizeChanged;`