diff options
| author | John Spurlock <jspurlock@google.com> | 2015-06-29 15:50:49 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-29 15:50:51 +0000 |
| commit | f21f1a915833783917b598f843b946975421ffd2 (patch) | |
| tree | 0009a8cc06c873bd178e92576b6aaa27c2268224 /packages | |
| parent | e3fc5415ed65ee7ad451069022b5405361aeb2e7 (diff) | |
| parent | dc005a8965133232c9605363c137405549819ab3 (diff) | |
| download | frameworks_base-f21f1a915833783917b598f843b946975421ffd2.zip frameworks_base-f21f1a915833783917b598f843b946975421ffd2.tar.gz frameworks_base-f21f1a915833783917b598f843b946975421ffd2.tar.bz2 | |
Merge "Volume Dialog: Fix NPE found in monkey testing." into mnc-dev
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/volume/VolumeDialogMotion.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogMotion.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogMotion.java index fdf1840..7de02f3 100644 --- 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); } |