Merge "Enable vibration for alert reminder on status bar" into udc-mainline-prod

2 files changed, 13 insertions, 3 deletions

diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertReminder.java b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertReminder.java
index 49eed8284..0868674b4 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertReminder.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertReminder.java
@@ -28,6 +28,7 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.content.res.Resources;
+import android.media.AudioAttributes;
 import android.media.AudioManager;
 import android.media.Ringtone;
 import android.media.RingtoneManager;
@@ -123,7 +124,15 @@ public class CellBroadcastAlertReminder extends Service {
         if (enableVibration) {
             // Vibrate for 500ms.
             Vibrator vibrator = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE);
-            vibrator.vibrate(VibrationEffect.createOneShot(500, VibrationEffect.DEFAULT_AMPLITUDE));
+            if (vibrator != null) {
+                AudioAttributes.Builder attrBuilder = new AudioAttributes.Builder();
+                attrBuilder.setUsage(AudioAttributes.USAGE_ALARM);
+                AudioAttributes attr = attrBuilder.build();
+                vibrator.vibrate(VibrationEffect.createOneShot(500,
+                        VibrationEffect.DEFAULT_AMPLITUDE), attr);
+            } else {
+                Log.e(TAG, "vibrator is null");
+            }
         }
     }
 
diff --git a/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastAlertReminderTest.java b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastAlertReminderTest.java
index 307cc2734..074ebe547 100644
--- a/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastAlertReminderTest.java
+++ b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastAlertReminderTest.java
@@ -26,6 +26,7 @@ import static org.mockito.Mockito.verify;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.media.AudioAttributes;
 import android.media.AudioManager;
 import android.os.HandlerThread;
 import android.preference.PreferenceManager;
@@ -120,7 +121,7 @@ public class CellBroadcastAlertReminderTest extends
         phoneStateListenerHandler.start();
         waitUntilReady();
 
-        verify(mMockedVibrator).vibrate(any());
+        verify(mMockedVibrator).vibrate(any(), (AudioAttributes) any());
         phoneStateListenerHandler.quit();
     }
 
@@ -140,7 +141,7 @@ public class CellBroadcastAlertReminderTest extends
         phoneStateListenerHandler.start();
         waitUntilReady();
 
-        verify(mMockedVibrator, never()).vibrate(any());
+        verify(mMockedVibrator, never()).vibrate(any(), (AudioAttributes) any());
         phoneStateListenerHandler.quit();
     }