[DO NOT MERGE] Do not dismiss volume dialog onAnimationEnd while dialog is showing

Bug: 80362864
Bug: 111478851

Change-Id: Iec6e27285bf35238d378e6561896f1d0b303fa24

diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogMotion.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogMotion.java
index 01d31e2..85f1908 100644 (file)
--- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogMotion.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogMotion.java
@@ -238,6 +238,7 @@ public class VolumeDialogMotion {
                         mHandler.postDelayed(new Runnable() {
                             @Override
                             public void run() {
+                                if (mShowing) return;
                                 if (D.BUG) Log.d(TAG, "mDialog.dismiss()");
                                 mDialog.dismiss();
                                 onComplete.run();