commit 5432355d0c7a7073d85ad3b2780e46bb69c0ac3f
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jan 03 20:51:22 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 03 20:51:22 2019 +0000
tree 3aeb03e27decc308371c596917f7db1cf490045b
parent 172458e01439e1bd7630a55f55a4d510876241b3
parent 2ca1aec1b9a06aa33c3f9bceebded80a6d1102ba

Merge "Update sound/vibrate notification key only when it actually buzz/beep."

services/core/java/com/android/server/notification/NotificationManagerService.java

diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java
index ff7a8b6..bca3f5d 100644
--- a/services/core/java/com/android/server/notification/NotificationManagerService.java
+++ b/services/core/java/com/android/server/notification/NotificationManagerService.java
@@ -4807,22 +4807,25 @@
                     }
                     if (DBG) Slog.v(TAG, "Interrupting!");
                     if (hasValidSound) {
-                        mSoundNotificationKey = key;
                         if (mInCall) {
                             playInCallNotification();
                             beep = true;
                         } else {
                             beep = playSound(record, soundUri);
                         }
+                        if(beep) {
+                            mSoundNotificationKey = key;
+                        }
                     }
 
                     final boolean ringerModeSilent =
                             mAudioManager.getRingerModeInternal()
                                     == AudioManager.RINGER_MODE_SILENT;
                     if (!mInCall && hasValidVibrate && !ringerModeSilent) {
-                        mVibrateNotificationKey = key;
-
                         buzz = playVibration(record, vibration, hasValidSound);
+                        if(buzz) {
+                            mVibrateNotificationKey = key;
+                        }
                     }
                 }
             }