commit 6ee06d073a352f267008d913e50bd946707c5bea
author John Spurlock <jspurlock@google.com> Fri Jul 18 20:06:20 2014 -0400
committer John Spurlock <jspurlock@google.com> Sat Jul 19 10:26:21 2014 -0400
tree bc414fe58a3fcdf54bc13d87d9b25eb686216a1e
parent c6cac354ad268aa77b27f5b3fbe2723a86441f10

Update Telephony to follow framework vibration api change.

Bug:15279516
Change-Id: Ib023ac1f7c8b0d51098d37d850172d81f66aeed4

src/com/android/phone/Ringer.java

diff --git a/src/com/android/phone/Ringer.java b/src/com/android/phone/Ringer.java
index 4688ba3..87becaa 100644
--- a/src/com/android/phone/Ringer.java
+++ b/src/com/android/phone/Ringer.java
@@ -17,6 +17,7 @@
 package com.android.phone;
 
 import android.content.Context;
+import android.media.AudioAttributes;
 import android.media.AudioManager;
 import android.media.Ringtone;
 import android.media.RingtoneManager;
@@ -49,6 +50,11 @@
     private static final int VIBRATE_LENGTH = 1000; // ms
     private static final int PAUSE_LENGTH = 1000; // ms
 
+    private static final AudioAttributes VIBRATION_ATTRIBUTES = new AudioAttributes.Builder()
+            .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
+            .setUsage(AudioAttributes.USAGE_NOTIFICATION_TELEPHONY_RINGTONE)
+            .build();
+
     /** The singleton instance. */
     private static Ringer sInstance;
 
@@ -253,7 +259,7 @@
     private class VibratorThread extends Thread {
         public void run() {
             while (mContinueVibrating) {
-                mVibrator.vibrate(VIBRATE_LENGTH, AudioManager.STREAM_RING);
+                mVibrator.vibrate(VIBRATE_LENGTH, VIBRATION_ATTRIBUTES);
                 SystemClock.sleep(VIBRATE_LENGTH + PAUSE_LENGTH);
             }
         }