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

am d229f442: Merge "Add a timeout state to frozen windows"

Browse Source 
* commit 'd229f442d5b8c2e600eaa4daeec0e771631ed83d':
  Add a timeout state to frozen windows
This commit is contained in:
Olawale Ogunwale
2015-04-07 17:35:53 +00:00
committed by Android Git Automerger
parent a9418c241f d229f442d5
commit bde7e467ac
1 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -506,7 +506,12 @@ public class WindowManagerService extends IWindowManager.Stub
int mLastDisplayFreezeDuration = 0; int mLastDisplayFreezeDuration = 0;
Object mLastFinishedFreezeSource = null; Object mLastFinishedFreezeSource = null;
boolean mWaitingForConfig = false; boolean mWaitingForConfig = false;
boolean mWindowsFreezingScreen = false;
final static int WINDOWS_FREEZING_SCREENS_NONE = 0;
final static int WINDOWS_FREEZING_SCREENS_ACTIVE = 1;
final static int WINDOWS_FREEZING_SCREENS_TIMEOUT = 2;
private int mWindowsFreezingScreen = WINDOWS_FREEZING_SCREENS_NONE;
boolean mClientFreezingScreen = false; boolean mClientFreezingScreen = false;
int mAppsFreezingScreen = 0; int mAppsFreezingScreen = 0;
int mLastWindowForcedOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED; int mLastWindowForcedOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
@@ -4779,7 +4784,7 @@ public class WindowManagerService extends IWindowManager.Stub
if (mAppsFreezingScreen == 1) { if (mAppsFreezingScreen == 1) {
startFreezingDisplayLocked(false, 0, 0); startFreezingDisplayLocked(false, 0, 0);
mH.removeMessages(H.APP_FREEZE_TIMEOUT); mH.removeMessages(H.APP_FREEZE_TIMEOUT);
mH.sendEmptyMessageDelayed(H.APP_FREEZE_TIMEOUT, 5000); mH.sendEmptyMessageDelayed(H.APP_FREEZE_TIMEOUT, 2000);
} }
} }
final int N = wtoken.allAppWindows.size(); final int N = wtoken.allAppWindows.size();
@@ -6570,7 +6575,7 @@ public class WindowManagerService extends IWindowManager.Stub
mAltOrientation = altOrientation; mAltOrientation = altOrientation;
mPolicy.setRotationLw(mRotation); mPolicy.setRotationLw(mRotation);
mWindowsFreezingScreen = true; mWindowsFreezingScreen = WINDOWS_FREEZING_SCREENS_ACTIVE;
mH.removeMessages(H.WINDOW_FREEZE_TIMEOUT); mH.removeMessages(H.WINDOW_FREEZE_TIMEOUT);
mH.sendEmptyMessageDelayed(H.WINDOW_FREEZE_TIMEOUT, WINDOW_FREEZE_TIMEOUT_DURATION); mH.sendEmptyMessageDelayed(H.WINDOW_FREEZE_TIMEOUT, WINDOW_FREEZE_TIMEOUT_DURATION);
mWaitingForConfig = true; mWaitingForConfig = true;
@@ -7940,6 +7945,7 @@ public class WindowManagerService extends IWindowManager.Stub
// TODO(multidisplay): Can non-default displays rotate? // TODO(multidisplay): Can non-default displays rotate?
synchronized (mWindowMap) { synchronized (mWindowMap) {
Slog.w(TAG, "Window freeze timeout expired."); Slog.w(TAG, "Window freeze timeout expired.");
mWindowsFreezingScreen = WINDOWS_FREEZING_SCREENS_TIMEOUT;
final WindowList windows = getDefaultWindowListLocked(); final WindowList windows = getDefaultWindowListLocked();
int i = windows.size(); int i = windows.size();
while (i > 0) { while (i > 0) {
@@ -8011,6 +8017,7 @@ public class WindowManagerService extends IWindowManager.Stub
case APP_FREEZE_TIMEOUT: { case APP_FREEZE_TIMEOUT: {
synchronized (mWindowMap) { synchronized (mWindowMap) {
Slog.w(TAG, "App freeze timeout expired."); Slog.w(TAG, "App freeze timeout expired.");
mWindowsFreezingScreen = WINDOWS_FREEZING_SCREENS_TIMEOUT;
final int numStacks = mStackIdToStack.size(); final int numStacks = mStackIdToStack.size();
for (int stackNdx = 0; stackNdx < numStacks; ++stackNdx) { for (int stackNdx = 0; stackNdx < numStacks; ++stackNdx) {
final TaskStack stack = mStackIdToStack.valueAt(stackNdx); final TaskStack stack = mStackIdToStack.valueAt(stackNdx);
@@ -9101,8 +9108,8 @@ public class WindowManagerService extends IWindowManager.Stub
w.mOrientationChanging = true; w.mOrientationChanging = true;
w.mLastFreezeDuration = 0; w.mLastFreezeDuration = 0;
mInnerFields.mOrientationChangeComplete = false; mInnerFields.mOrientationChangeComplete = false;
if (!mWindowsFreezingScreen) { if (mWindowsFreezingScreen == WINDOWS_FREEZING_SCREENS_NONE) {
mWindowsFreezingScreen = true; mWindowsFreezingScreen = WINDOWS_FREEZING_SCREENS_ACTIVE;
// XXX should probably keep timeout from // XXX should probably keep timeout from
// when we first froze the display. // when we first froze the display.
mH.removeMessages(H.WINDOW_FREEZE_TIMEOUT); mH.removeMessages(H.WINDOW_FREEZE_TIMEOUT);
@@ -10127,8 +10134,8 @@ public class WindowManagerService extends IWindowManager.Stub
"With display frozen, orientationChangeComplete=" "With display frozen, orientationChangeComplete="
+ mInnerFields.mOrientationChangeComplete); + mInnerFields.mOrientationChangeComplete);
if (mInnerFields.mOrientationChangeComplete) { if (mInnerFields.mOrientationChangeComplete) {
if (mWindowsFreezingScreen) { if (mWindowsFreezingScreen != WINDOWS_FREEZING_SCREENS_NONE) {
mWindowsFreezingScreen = false; mWindowsFreezingScreen = WINDOWS_FREEZING_SCREENS_NONE;
mLastFinishedFreezeSource = mInnerFields.mLastWindowFreezeSource; mLastFinishedFreezeSource = mInnerFields.mLastWindowFreezeSource;
mH.removeMessages(H.WINDOW_FREEZE_TIMEOUT); mH.removeMessages(H.WINDOW_FREEZE_TIMEOUT);
} }
@@ -10416,7 +10423,7 @@ public class WindowManagerService extends IWindowManager.Stub
} else { } else {
mInnerFields.mOrientationChangeComplete = true; mInnerFields.mOrientationChangeComplete = true;
mInnerFields.mLastWindowFreezeSource = mAnimator.mLastWindowFreezeSource; mInnerFields.mLastWindowFreezeSource = mAnimator.mLastWindowFreezeSource;
if (mWindowsFreezingScreen) { if (mWindowsFreezingScreen != WINDOWS_FREEZING_SCREENS_NONE) {
doRequest = true; doRequest = true;
} }
} }
@@ -10761,7 +10768,8 @@ public class WindowManagerService extends IWindowManager.Stub
return; return;
} }
if (mWaitingForConfig || mAppsFreezingScreen > 0 || mWindowsFreezingScreen if (mWaitingForConfig || mAppsFreezingScreen > 0
|| mWindowsFreezingScreen == WINDOWS_FREEZING_SCREENS_ACTIVE
|| mClientFreezingScreen || !mOpeningApps.isEmpty()) { || mClientFreezingScreen || !mOpeningApps.isEmpty()) {
if (DEBUG_ORIENTATION) Slog.d(TAG, if (DEBUG_ORIENTATION) Slog.d(TAG,
"stopFreezingDisplayLocked: Returning mWaitingForConfig=" + mWaitingForConfig "stopFreezingDisplayLocked: Returning mWaitingForConfig=" + mWaitingForConfig