am d5a1530f: Make the dialpad silent in "vibrate only" mode (bug 1984905).

Merge commit 'd5a1530f68c48075cd3df5c948b54ad34f059df1'

* commit 'd5a1530f68c48075cd3df5c948b54ad34f059df1':
  Make the dialpad silent in "vibrate only" mode (bug 1984905).
diff --git a/src/com/android/contacts/TwelveKeyDialer.java b/src/com/android/contacts/TwelveKeyDialer.java
index 9284e05..2277e56 100644
--- a/src/com/android/contacts/TwelveKeyDialer.java
+++ b/src/com/android/contacts/TwelveKeyDialer.java
@@ -723,7 +723,9 @@
         // onResume(), since it's possible to toggle silent mode without
         // leaving the current activity (via the ENDCALL-longpress menu.)
         AudioManager audioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
-        if (audioManager.getRingerMode() == AudioManager.RINGER_MODE_SILENT) {
+        int ringerMode = audioManager.getRingerMode();
+        if ((ringerMode == AudioManager.RINGER_MODE_SILENT)
+            || (ringerMode == AudioManager.RINGER_MODE_VIBRATE)) {
             return;
         }