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

2015-06-29 15:50:49 +00:00
parent e3fc5415ed dc005a8965
commit f21f1a9158
1 changed files with 6 additions and 2 deletions
--- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogMotion.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogMotion.java
@@ -198,9 +198,13 @@ public class VolumeDialogMotion {
        setDismissing(true);
        if (mShowing) {
            mDialogView.animate().cancel();
-            mContentsPositionAnimator.cancel();
+            if (mContentsPositionAnimator != null) {
+                mContentsPositionAnimator.cancel();
+            }
            mContents.animate().cancel();
-            mChevronPositionAnimator.cancel();
+            if (mChevronPositionAnimator != null) {
+                mChevronPositionAnimator.cancel();
+            }
            mChevron.animate().cancel();
            setShowing(false);
        }