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

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

Browse Source 
* commit 'f21f1a915833783917b598f843b946975421ffd2':
  Volume Dialog: Fix NPE found in monkey testing.
This commit is contained in:
John Spurlock
2015-06-29 16:02:10 +00:00
committed by Android Git Automerger
parent 511a1aca49 f21f1a9158
commit 090a9437b3
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);
}