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

Merge "Eliminate potential for NPE in WindowAnimator." into jb-mr1-dev

Browse Source
This commit is contained in:
Craig Mautner
2012-09-21 11:17:51 -07:00
committed by Android (Google) Code Review
parent 61d37041ac ac439e57a7
commit 9921d842bb
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
services/java/com/android/server/wm/WindowAnimator.java
View File

@@ -139,10 +139,8 @@ public class WindowAnimator {
}
void addDisplayLocked(final int displayId) {
DisplayContentsAnimator displayAnimator = getDisplayContentsAnimatorLocked(displayId);
displayAnimator.mWindowAnimationBackgroundSurface =
new DimSurface(mService.mFxSession, displayId);
displayAnimator.mDimAnimator = new DimAnimator(mService.mFxSession, displayId);
// Create the DisplayContentsAnimator object by retrieving it.
getDisplayContentsAnimatorLocked(displayId);
if (displayId == Display.DEFAULT_DISPLAY) {
mInitialized = true;
}
@@ -787,7 +785,7 @@ public class WindowAnimator {
private DisplayContentsAnimator getDisplayContentsAnimatorLocked(int displayId) {
DisplayContentsAnimator displayAnimator = mDisplayContentsAnimators.get(displayId);
if (displayAnimator == null) {
displayAnimator = new DisplayContentsAnimator();
displayAnimator = new DisplayContentsAnimator(displayId);
mDisplayContentsAnimators.put(displayId, displayAnimator);
}
return displayAnimator;
@@ -801,11 +799,17 @@ public class WindowAnimator {
return getDisplayContentsAnimatorLocked(displayId).mScreenRotationAnimation;
}
private static class DisplayContentsAnimator {
private class DisplayContentsAnimator {
WinAnimatorList mWinAnimators = new WinAnimatorList();
DimAnimator mDimAnimator = null;
final DimAnimator mDimAnimator;
DimAnimator.Parameters mDimParams = null;
DimSurface mWindowAnimationBackgroundSurface = null;
final DimSurface mWindowAnimationBackgroundSurface;
ScreenRotationAnimation mScreenRotationAnimation = null;
public DisplayContentsAnimator(int displayId) {
mDimAnimator = new DimAnimator(mService.mFxSession, displayId);
mWindowAnimationBackgroundSurface =
new DimSurface(mService.mFxSession, displayId);
}
}
}