summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Android Build Merger (Role) <android-build-merger@google.com> 2016-06-24 01:24:11 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2016-06-24 01:24:12 +0000
commit15bfd442c26ee22eb245a3d6a39c3dfd85e5f8bb (patch)
treefaabb5023ef0b4809d4e40acdc4de8d49fed9045
parente3f410cd593b5a0fa398850d922e90246e81e5ac (diff)
parent30ef6e3577136f1bfdf8848ef0e19c41d9cec9d1 (diff)
Merge "Access internal ringer mode to properly vibrate in DND am: dcbdc0df43" into nyc-mr1-dev
-rw-r--r--services/core/java/com/android/server/VibratorService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/VibratorService.java b/services/core/java/com/android/server/VibratorService.java
index 7f3eb15c6ebf..ab036c7163d3 100644
--- a/services/core/java/com/android/server/VibratorService.java
+++ b/services/core/java/com/android/server/VibratorService.java
@@ -487,7 +487,7 @@ public class VibratorService extends IVibratorService.Stub
private boolean shouldVibrateForRingtone() {
AudioManager audioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
- int ringerMode = audioManager.getRingerMode();
+ int ringerMode = audioManager.getRingerModeInternal();
// "Also vibrate for calls" Setting in Sound
if (Settings.System.getInt(
mContext.getContentResolver(), Settings.System.VIBRATE_WHEN_RINGING, 0) != 0) {