summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2014-11-26 12:08:50 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-26 12:08:50 +0000
commit673982883ad6fa0b0eb472abbada74bc7fffc879 (patch)
tree1e32b15a932efca86936f2120b9eff9513d79d47
parent58d3e6dc831cc7052a0bb4fd5897fd799f0f795b (diff)
parentacb9722dfb7b5fcb6bda96fa476702b78779c24d (diff)
downloadandroid_packages_services_Telecomm-673982883ad6fa0b0eb472abbada74bc7fffc879.tar.gz
android_packages_services_Telecomm-673982883ad6fa0b0eb472abbada74bc7fffc879.tar.bz2
android_packages_services_Telecomm-673982883ad6fa0b0eb472abbada74bc7fffc879.zip
am acb9722d: am f55886f0: am 1522691e: Ringer: Use internal ringer mode when determining vibration.
* commit 'acb9722dfb7b5fcb6bda96fa476702b78779c24d': 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 {