summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2014-11-26 12:01:58 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-26 12:01:58 +0000
commitacb9722dfb7b5fcb6bda96fa476702b78779c24d (patch)
tree6eac5fc1389b36aa0397e958a64ba47d74f473af
parentb076cb94d2307dd0ceec59d61a733a67b9395afe (diff)
parentf55886f0a063c2486ea145d39cd626aa7f35eb67 (diff)
downloadandroid_packages_services_Telecomm-acb9722dfb7b5fcb6bda96fa476702b78779c24d.tar.gz
android_packages_services_Telecomm-acb9722dfb7b5fcb6bda96fa476702b78779c24d.tar.bz2
android_packages_services_Telecomm-acb9722dfb7b5fcb6bda96fa476702b78779c24d.zip
am f55886f0: am 1522691e: Ringer: Use internal ringer mode when determining vibration.
* commit 'f55886f0a063c2486ea145d39cd626aa7f35eb67': Ringer: Use internal ringer mode when determining vibration.
-rw-r--r--src/com/android/server/telecom/Ringer.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/server/telecom/Ringer.java b/src/com/android/server/telecom/Ringer.java
index 5945306a..6b46a71b 100644
--- a/src/com/android/server/telecom/Ringer.java
+++ b/src/com/android/server/telecom/Ringer.java
@@ -252,7 +252,7 @@ final class Ringer extends CallsManagerListenerBase {
private boolean shouldVibrate(Context context) {
AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
- int ringerMode = audioManager.getRingerMode();
+ int ringerMode = audioManager.getRingerModeInternal();
if (getVibrateWhenRinging(context)) {
return ringerMode != AudioManager.RINGER_MODE_SILENT;
} else {