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

Merge "Enabled wait for wallpaper draw code, but reduced timeout to 500ms"

Browse Source
This commit is contained in:
Wale Ogunwale
2015-04-06 23:50:48 +00:00
committed by Android (Google) Code Review
parent bc80a260cf f49c92fb08
commit 91d4c1d97a
1 changed files with 36 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -617,8 +617,8 @@ public class WindowManagerService extends IWindowManager.Stub
static final long WALLPAPER_TIMEOUT_RECOVERY = 10000;
boolean mAnimateWallpaperWithTarget;
// We give a wallpaper up to 1000ms to finish drawing before playing app transitions.
static final long WALLPAPER_DRAW_PENDING_TIMEOUT_DURATION = 1000;
// We give a wallpaper up to 500ms to finish drawing before playing app transitions.
static final long WALLPAPER_DRAW_PENDING_TIMEOUT_DURATION = 500;
static final int WALLPAPER_DRAW_NORMAL = 0;
static final int WALLPAPER_DRAW_PENDING = 1;
static final int WALLPAPER_DRAW_TIMEOUT = 2;
@@ -9064,41 +9064,40 @@ public class WindowManagerService extends IWindowManager.Stub
goodToGo = false;
}
}
// Stuck in a state with mWallpaperDrawState == WALLPAPER_DRAW_PENDING without a timeout. Leave
// commented out until that is understood.
// if (goodToGo && isWallpaperVisible(mWallpaperTarget)) {
// boolean wallpaperGoodToGo = true;
// for (int curTokenIndex = mWallpaperTokens.size() - 1;
// curTokenIndex >= 0 && wallpaperGoodToGo; curTokenIndex--) {
// WindowToken token = mWallpaperTokens.get(curTokenIndex);
// for (int curWallpaperIndex = token.windows.size() - 1; curWallpaperIndex >= 0;
// curWallpaperIndex--) {
// WindowState wallpaper = token.windows.get(curWallpaperIndex);
// if (wallpaper.mWallpaperVisible && !wallpaper.isDrawnLw()) {
// // We've told this wallpaper to be visible, but it is not drawn yet
// wallpaperGoodToGo = false;
// if (mWallpaperDrawState != WALLPAPER_DRAW_TIMEOUT) {
// // wait for this wallpaper until it is drawn or timeout
// goodToGo = false;
// }
// if (mWallpaperDrawState == WALLPAPER_DRAW_NORMAL) {
// mWallpaperDrawState = WALLPAPER_DRAW_PENDING;
// mH.removeMessages(H.WALLPAPER_DRAW_PENDING_TIMEOUT);
// mH.sendEmptyMessageDelayed(H.WALLPAPER_DRAW_PENDING_TIMEOUT,
// WALLPAPER_DRAW_PENDING_TIMEOUT_DURATION);
// }
// if (DEBUG_APP_TRANSITIONS || DEBUG_WALLPAPER) Slog.v(TAG,
// "Wallpaper should be visible but has not been drawn yet. " +
// "mWallpaperDrawState=" + mWallpaperDrawState);
// break;
// }
// }
// }
// if (wallpaperGoodToGo) {
// mWallpaperDrawState = WALLPAPER_DRAW_NORMAL;
// mH.removeMessages(H.WALLPAPER_DRAW_PENDING_TIMEOUT);
// }
// }
if (goodToGo && isWallpaperVisible(mWallpaperTarget)) {
boolean wallpaperGoodToGo = true;
for (int curTokenIndex = mWallpaperTokens.size() - 1;
curTokenIndex >= 0 && wallpaperGoodToGo; curTokenIndex--) {
WindowToken token = mWallpaperTokens.get(curTokenIndex);
for (int curWallpaperIndex = token.windows.size() - 1; curWallpaperIndex >= 0;
curWallpaperIndex--) {
WindowState wallpaper = token.windows.get(curWallpaperIndex);
if (wallpaper.mWallpaperVisible && !wallpaper.isDrawnLw()) {
// We've told this wallpaper to be visible, but it is not drawn yet
wallpaperGoodToGo = false;
if (mWallpaperDrawState != WALLPAPER_DRAW_TIMEOUT) {
// wait for this wallpaper until it is drawn or timeout
goodToGo = false;
}
if (mWallpaperDrawState == WALLPAPER_DRAW_NORMAL) {
mWallpaperDrawState = WALLPAPER_DRAW_PENDING;
mH.removeMessages(H.WALLPAPER_DRAW_PENDING_TIMEOUT);
mH.sendEmptyMessageDelayed(H.WALLPAPER_DRAW_PENDING_TIMEOUT,
WALLPAPER_DRAW_PENDING_TIMEOUT_DURATION);
}
if (DEBUG_APP_TRANSITIONS || DEBUG_WALLPAPER) Slog.v(TAG,
"Wallpaper should be visible but has not been drawn yet. " +
"mWallpaperDrawState=" + mWallpaperDrawState);
break;
}
}
}
if (wallpaperGoodToGo) {
mWallpaperDrawState = WALLPAPER_DRAW_NORMAL;
mH.removeMessages(H.WALLPAPER_DRAW_PENDING_TIMEOUT);
}
}
}
if (goodToGo) {
if (DEBUG_APP_TRANSITIONS) Slog.v(TAG, "**** GOOD TO GO");