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

Merge "Volume Dialog: Fix NPE found in monkey testing." into mnc-dev

Browse Source
This commit is contained in:
John Spurlock
2015-06-29 15:50:49 +00:00
committed by Android (Google) Code Review
parent e3fc5415ed dc005a8965
commit f21f1a9158
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/volume/VolumeDialogMotion.java
View File

@@ -198,9 +198,13 @@ public class VolumeDialogMotion {
setDismissing(true); setDismissing(true);
if (mShowing) { if (mShowing) {
mDialogView.animate().cancel(); mDialogView.animate().cancel();
if (mContentsPositionAnimator != null) {
mContentsPositionAnimator.cancel(); mContentsPositionAnimator.cancel();
}
mContents.animate().cancel(); mContents.animate().cancel();
if (mChevronPositionAnimator != null) {
mChevronPositionAnimator.cancel(); mChevronPositionAnimator.cancel();
}
mChevron.animate().cancel(); mChevron.animate().cancel();
setShowing(false); setShowing(false);
} }