Merge "Fix issue #2608292: Fails to launch the video camera preview" into froyo

This commit is contained in:
Dianne Hackborn
2010-04-22 16:20:19 -07:00
committed by Android (Google) Code Review

View File

@ -7580,8 +7580,9 @@ 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;
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
@ -7591,6 +7592,7 @@ public class WindowManagerService extends IWindowManager.Stub
mLayoutNeeded = true;
}
}
}
if (mAttrs.type != TYPE_APPLICATION_STARTING
&& mAppToken != null) {