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

Merge change Ia48b3f2a into eclair

Browse Source 
* changes:
  Fix #2313887: Device doesn't boot after rebooting device...
This commit is contained in:
Android (Google) Code Review
2009-12-09 18:41:04 -08:00
parent 88ff62db35 f3bea9cb75
commit d3cfb1bd84
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4301,7 +4301,7 @@ public class WindowManagerService extends IWindowManager.Stub
final int N = mWindows.size(); final int N = mWindows.size();
for (int i=0; i<N; i++) { for (int i=0; i<N; i++) {
WindowState w = (WindowState)mWindows.get(i); WindowState w = (WindowState)mWindows.get(i);
if (w.isVisibleLw() && !w.isDrawnLw()) { if (w.isVisibleLw() && !w.mObscured && !w.isDrawnLw()) {
return; return;
} }
} }
@@ -7563,6 +7563,12 @@ public class WindowManagerService extends IWindowManager.Stub
mHasTransformation = false; mHasTransformation = false;
mHasLocalTransformation = false; mHasLocalTransformation = false;
mPolicyVisibility = mPolicyVisibilityAfterAnim; mPolicyVisibility = mPolicyVisibilityAfterAnim;
if (!mPolicyVisibility) {
// Window is no longer visible -- make sure if we were waiting
// for it to be displayed before enabling the display, that
// we allow the display to be enabled now.
enableScreenIfNeededLocked();
}
mTransformation.clear(); mTransformation.clear();
if (mHasDrawn if (mHasDrawn
&& mAttrs.type == WindowManager.LayoutParams.TYPE_APPLICATION_STARTING && mAttrs.type == WindowManager.LayoutParams.TYPE_APPLICATION_STARTING
@@ -8020,6 +8026,10 @@ public class WindowManagerService extends IWindowManager.Stub
} else { } else {
mPolicyVisibilityAfterAnim = false; mPolicyVisibilityAfterAnim = false;
mPolicyVisibility = false; mPolicyVisibility = false;
// Window is no longer visible -- make sure if we were waiting
// for it to be displayed before enabling the display, that
// we allow the display to be enabled now.
enableScreenIfNeededLocked();
} }
if (requestAnim) { if (requestAnim) {
requestAnimationLocked(0); requestAnimationLocked(0);
@@ -10353,6 +10363,10 @@ public class WindowManagerService extends IWindowManager.Stub
LocalPowerManager.BUTTON_EVENT, true); LocalPowerManager.BUTTON_EVENT, true);
mTurnOnScreen = false; mTurnOnScreen = false;
} }
// Check to see if we are now in a state where the screen should
// be enabled, because the window obscured flags have changed.
enableScreenIfNeededLocked();
} }
void requestAnimationLocked(long delay) { void requestAnimationLocked(long delay) {