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

A little more wallpaper robustness.

Browse Source 
- Recover if a live wallpaper is crashing repeatedly.
- Don't crash when someone tries to set a static wallpaper.
- Make the static wallpaper update correctly when the image changes.
This commit is contained in:
Dianne Hackborn
2009-08-13 18:51:59 -07:00
parent 1d47a51426
commit 0cd48879dc
3 changed files with 53 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1194,6 +1194,9 @@ public class WindowManagerService extends IWindowManager.Stub
}
if (!visible) w = null;
//if (mWallpaperTarget != w) {
// Log.v(TAG, "New wallpaper target: " + w);
//}
mWallpaperTarget = w;
if (visible) {
@@ -6900,10 +6903,10 @@ public class WindowManagerService extends IWindowManager.Stub
if (atoken != null) {
return mSurface != null && mPolicyVisibility && !mDestroying
&& ((!mAttachedHidden && !atoken.hiddenRequested)
|| mAnimating || atoken.animating);
|| mAnimation != null || atoken.animation != null);
} else {
return mSurface != null && mPolicyVisibility && !mDestroying
&& (!mAttachedHidden || mAnimating);
&& (!mAttachedHidden || mAnimation != null);
}
}
@@ -6913,10 +6916,11 @@ public class WindowManagerService extends IWindowManager.Stub
*/
boolean isReadyForDisplay() {
final AppWindowToken atoken = mAppToken;
final boolean animating = atoken != null ? atoken.animating : false;
final boolean animating = atoken != null
? (atoken.animation != null) : false;
return mSurface != null && mPolicyVisibility && !mDestroying
&& ((!mAttachedHidden && !mRootToken.hidden)
|| mAnimating || animating);
|| mAnimation != null || animating);
}
/** Is the window or its container currently animating? */