am 476a57e6: am 9bc0a572: Merge "Fix issue #2608292: Fails to launch the video camera preview" into froyo

Merge commit '476a57e64a7fa7143e434c1064df1fa87fe4b01a' into kraken

* commit '476a57e64a7fa7143e434c1064df1fa87fe4b01a':
  Fix issue #2608292: Fails to launch the video camera preview
This commit is contained in:
Dianne Hackborn
2010-04-22 16:29:56 -07:00
committed by Android Git Automerger

View File

@@ -7580,15 +7580,17 @@ public class WindowManagerService extends IWindowManager.Stub
while (i > 0) {
i--;
WindowState c = (WindowState)mChildWindows.get(i);
if (c.mSurface != null && c.mAttachedHidden) {
if (c.mAttachedHidden) {
c.mAttachedHidden = false;
c.performShowLocked();
// It hadn't been shown, which means layout not
// performed on it, so now we want to make sure to
// do a layout. If called from within the transaction
// loop, this will cause it to restart with a new
// layout.
mLayoutNeeded = true;
if (c.mSurface != null) {
c.performShowLocked();
// It hadn't been shown, which means layout not
// performed on it, so now we want to make sure to
// do a layout. If called from within the transaction
// loop, this will cause it to restart with a new
// layout.
mLayoutNeeded = true;
}
}
}