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

Merge "Fix replacing window timeouts" into nyc-dev

Browse Source
This commit is contained in:
Chong Zhang
2016-05-12 23:48:35 +00:00
committed by Android (Google) Code Review
parent 2b8dcdeda4 32de365bd8
commit a63e1325b5
2 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/wm/AppWindowToken.java
View File

@@ -582,10 +582,7 @@ class AppWindowToken extends WindowToken {
w.mSkipEnterAnimationForSeamlessReplacement = !candidate.mAnimateReplacingWindow;
// if we got a replacement window, reset the timeout to give drawing more time
service.mH.removeMessages(H.WINDOW_REPLACEMENT_TIMEOUT);
service.mH.sendMessageDelayed(
service.mH.obtainMessage(H.WINDOW_REPLACEMENT_TIMEOUT, this),
WINDOW_REPLACEMENT_TIMEOUT_DURATION);
service.scheduleReplacingWindowTimeouts(this);
}
}
allAppWindows.add(w);

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

@@ -414,6 +414,12 @@ public class WindowManagerService extends IWindowManager.Stub
*/
final ArrayList<AppWindowToken> mFinishedStarting = new ArrayList<>();
/**
* List of app window tokens that are waiting for replacing windows. If the
* replacement doesn't come in time the stale windows needs to be disposed of.
*/
final ArrayList<AppWindowToken> mReplacingWindowTimeouts = new ArrayList<>();
/**
* The input consumer added to the window manager which consumes input events to windows below
* it.
@@ -8497,9 +8503,12 @@ public class WindowManagerService extends IWindowManager.Stub
}
break;
case WINDOW_REPLACEMENT_TIMEOUT: {
final AppWindowToken token = (AppWindowToken) msg.obj;
synchronized (mWindowMap) {
token.clearTimedoutReplacesLocked();
for (int i = mReplacingWindowTimeouts.size() - 1; i >= 0; i--) {
final AppWindowToken token = mReplacingWindowTimeouts.get(i);
token.clearTimedoutReplacesLocked();
}
mReplacingWindowTimeouts.clear();
}
}
case NOTIFY_APP_TRANSITION_STARTING: {
@@ -10769,16 +10778,22 @@ public class WindowManagerService extends IWindowManager.Stub
return;
}
if (replacing) {
mH.removeMessages(H.WINDOW_REPLACEMENT_TIMEOUT);
mH.sendMessageDelayed(
mH.obtainMessage(H.WINDOW_REPLACEMENT_TIMEOUT, appWindowToken),
WINDOW_REPLACEMENT_TIMEOUT_DURATION);
scheduleReplacingWindowTimeouts(appWindowToken);
} else {
appWindowToken.resetReplacingWindows();
}
}
}
void scheduleReplacingWindowTimeouts(AppWindowToken appWindowToken) {
if (!mReplacingWindowTimeouts.contains(appWindowToken)) {
mReplacingWindowTimeouts.add(appWindowToken);
}
mH.removeMessages(H.WINDOW_REPLACEMENT_TIMEOUT);
mH.sendEmptyMessageDelayed(
H.WINDOW_REPLACEMENT_TIMEOUT, WINDOW_REPLACEMENT_TIMEOUT_DURATION);
}
@Override
public int getDockedStackSide() {
synchronized (mWindowMap) {