commit 2186f7f21a2c4db089d84911150489dac476f989
author Evan Charlton <evanc@google.com> Thu Apr 10 12:00:37 2014 -0700
committer Evan Charlton <evanc@google.com> Thu Apr 10 12:00:37 2014 -0700
tree 5b562c41e7216be0fca6a3a4506b8cb34b7c979b
parent e519d995fc739fee871a4a88ceb0d30bf62f2087

Don't bundle the vibration with the volume

Setting the volume to zero should not affect the vibration.

Bug: 13937034
Change-Id: I03bc2323d4bf5900416ac079fdd1f3572de99494

src/com/android/telecomm/Ringer.java

diff --git a/src/com/android/telecomm/Ringer.java b/src/com/android/telecomm/Ringer.java
index f298081..367a1de 100644
--- a/src/com/android/telecomm/Ringer.java
+++ b/src/com/android/telecomm/Ringer.java
@@ -168,15 +168,15 @@
                 mCallAudioManager.setIsRinging(true);
 
                 mRingtonePlayer.play();
-
-                if (shouldVibrate(TelecommApp.getInstance()) && !mIsVibrating) {
-                    mVibrator.vibrate(VIBRATION_PATTERN, VIBRATION_PATTERN_REPEAT,
-                            AudioManager.STREAM_RING);
-                    mIsVibrating = true;
-                }
             } else {
                 Log.v(this, "startRingingOrCallWaiting, skipping because volume is 0");
             }
+
+            if (shouldVibrate(TelecommApp.getInstance()) && !mIsVibrating) {
+                mVibrator.vibrate(VIBRATION_PATTERN, VIBRATION_PATTERN_REPEAT,
+                        AudioManager.STREAM_RING);
+                mIsVibrating = true;
+            }
         } else {
             Log.v(this, "Playing call-waiting tone.");