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

Fix NPE in overridePlayingAppAnimations

Browse Source 
It's not guaranteed that findMainWindow() is non-null, which can happen
if the window was just added, so we should not crash in that case.

Change-Id: I1f04876ef48bfc7636320124b7f60d6dfa0b24a2
Fixes: 31767124
This commit is contained in:
Jorim Jaggi
2016-09-28 13:30:27 +02:00
parent 4e236046ae
commit 6e5f3d2e9f
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -846,6 +846,9 @@ class AppWindowToken extends WindowToken {
void overridePlayingAppAnimations(Animation a) { void overridePlayingAppAnimations(Animation a) {
if (mAppAnimator.isAnimating()) { if (mAppAnimator.isAnimating()) {
final WindowState win = findMainWindow(); final WindowState win = findMainWindow();
if (win == null) {
return;
}
final int width = win.mContainingFrame.width(); final int width = win.mContainingFrame.width();
final int height = win.mContainingFrame.height(); final int height = win.mContainingFrame.height();
mAppAnimator.setAnimation(a, width, height, false, STACK_CLIP_NONE); mAppAnimator.setAnimation(a, width, height, false, STACK_CLIP_NONE);