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

am 6b1cb352: Fix issue #2149126: unable to answer incoming call, various problems

Browse Source 
Merge commit '6b1cb352b86f2cf983026f2e6814665e12eb8452' into eclair-plus-aosp

* commit '6b1cb352b86f2cf983026f2e6814665e12eb8452':
  Fix issue #2149126: unable to answer incoming call, various problems
This commit is contained in:
Dianne Hackborn
2009-09-28 20:04:01 -07:00
committed by Android Git Automerger
parent e88adf369a 6b1cb352b8
commit 7219195066
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1396,12 +1396,15 @@ public class WindowManagerService extends IWindowManager.Stub
} }
} }
} else { } else if (mLowerWallpaperTarget != null) {
// Is it time to stop animating? // Is it time to stop animating?
if (mLowerWallpaperTarget == null boolean lowerAnimating = mLowerWallpaperTarget.mAnimation != null
|| mLowerWallpaperTarget.mAppToken.animation == null || (mLowerWallpaperTarget.mAppToken != null
|| mUpperWallpaperTarget == null && mLowerWallpaperTarget.mAppToken.animation != null);
|| mUpperWallpaperTarget.mAppToken.animation == null) { boolean upperAnimating = mUpperWallpaperTarget.mAnimation != null
|| (mUpperWallpaperTarget.mAppToken != null
&& mUpperWallpaperTarget.mAppToken.animation != null);
if (!lowerAnimating || !upperAnimating) {
if (DEBUG_WALLPAPER) { if (DEBUG_WALLPAPER) {
Log.v(TAG, "No longer animating wallpaper targets!"); Log.v(TAG, "No longer animating wallpaper targets!");
} }