Merge "Volume: Defend against monkeys pulling tags too early." into mnc-dev

1 files changed, 7 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 7de02f3..4bb1011 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogMotion.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogMotion.java
@@ -126,6 +126,11 @@ public class VolumeDialogMotion {
         return mChevron.getHeight() / 6;
     }
 
+    private int chevronPosY() {
+        final Object tag = mChevron == null ? null : mChevron.getTag();
+        return tag == null ? 0 : (Integer) tag;
+    }
+
     private void startShowAnimation() {
         if (D.BUG) Log.d(TAG, "startShowAnimation");
         mDialogView.animate()
@@ -139,7 +144,7 @@ public class VolumeDialogMotion {
                         if (mChevronPositionAnimator == null) return;
                         // reposition chevron
                         final float v = (Float) mChevronPositionAnimator.getAnimatedValue();
-                        final int posY = (Integer) mChevron.getTag();
+                        final int posY = chevronPosY();
                         mChevron.setTranslationY(posY + v + -mDialogView.getTranslationY());
                     }})
                 .start();
@@ -216,7 +221,7 @@ public class VolumeDialogMotion {
                     @Override
                     public void onAnimationUpdate(ValueAnimator animation) {
                         mContents.setTranslationY(-mDialogView.getTranslationY());
-                        int posY = (Integer) mChevron.getTag();
+                        final int posY = chevronPosY();
                         mChevron.setTranslationY(posY + -mDialogView.getTranslationY());
                     }
                 })