commit d2f042056ce7a80466c241f0370664ad698404df
author Jack Yu <jackyu@google.com> Tue Aug 08 10:22:45 2017 -0700
committer Jack Yu <jackyu@google.com> Wed Aug 09 06:41:21 2017 -0700
tree bc0a63c1df117829e35f4ad560b1150bdb73799b
parent c3c2bd65b10aaa485b1caa5e405284eb5c833b25

Fixed ETWS vibration

The previous fix for ETWS vibration is not correct.

Test: manual
bug: 32652878
Merged-In: I67dc3d96f11d890838ecd365d3710c94ad1275aa
Change-Id: I67dc3d96f11d890838ecd365d3710c94ad1275aa

src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java

diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java
index 035cf29..32c6e28 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java
@@ -485,9 +485,6 @@
                 }
             }
         } else {
-            // For other alerts, vibration can be disabled in app settings.
-            audioIntent.putExtra(CellBroadcastAlertAudio.ALERT_AUDIO_VIBRATE_EXTRA,
-                    prefs.getBoolean(CellBroadcastSettings.KEY_ENABLE_ALERT_VIBRATE, true));
             int channel = message.getServiceCategory();
             ArrayList<CellBroadcastChannelRange> ranges = CellBroadcastChannelManager
                     .getInstance().getCellBroadcastChannelRanges(getApplicationContext());
@@ -501,6 +498,8 @@
             }
         }
         audioIntent.putExtra(CellBroadcastAlertAudio.ALERT_AUDIO_TONE_TYPE, toneType);
+        audioIntent.putExtra(CellBroadcastAlertAudio.ALERT_AUDIO_VIBRATE_EXTRA,
+                prefs.getBoolean(CellBroadcastSettings.KEY_ENABLE_ALERT_VIBRATE, true));
 
         String messageBody = message.getMessageBody();