Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge commit '9bc0a572d8459e0b6209e8a68cb680389c1f8b73' into froyo-plus-aosp

* commit '9bc0a572d8459e0b6209e8a68cb680389c1f8b73':
  Fix issue #2608292: Fails to launch the video camera preview
This commit is contained in:
Dianne Hackborn
2010-04-22 16:24:08 -07:00
committed by Android Git Automerger
parent a298d6fd2a 9bc0a572d8
commit 476a57e64a
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/java/com/android/server/WindowManagerService.java
View File

@@ -7580,8 +7580,9 @@ public class WindowManagerService extends IWindowManager.Stub
while (i > 0) { while (i > 0) {
i--; i--;
WindowState c = (WindowState)mChildWindows.get(i); WindowState c = (WindowState)mChildWindows.get(i);
if (c.mSurface != null && c.mAttachedHidden) { if (c.mAttachedHidden) {
c.mAttachedHidden = false; c.mAttachedHidden = false;
if (c.mSurface != null) {
c.performShowLocked(); c.performShowLocked();
// It hadn't been shown, which means layout not // It hadn't been shown, which means layout not
// performed on it, so now we want to make sure to // performed on it, so now we want to make sure to
@@ -7591,6 +7592,7 @@ public class WindowManagerService extends IWindowManager.Stub
mLayoutNeeded = true; mLayoutNeeded = true;
} }
} }
}
if (mAttrs.type != TYPE_APPLICATION_STARTING if (mAttrs.type != TYPE_APPLICATION_STARTING
&& mAppToken != null) { && mAppToken != null) {