Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55102a8e authored by Seungho Lee's avatar Seungho Lee Committed by Julia Reynolds
Browse files

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

Test: Make notification with vibration pattern with [0]
Test: Check mVibrateNotificationKey unchanged
Change-Id: I208797f370ac5a30db5fcc316be956335a418319
parent 90a78ef0

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

+6 −3
Original line number Diff line number Diff line
@@ -5258,22 +5258,25 @@ public class NotificationManagerService extends SystemService { 
                    }

                    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;

                        }

                    }

                } else if ((record.getFlags() & Notification.FLAG_INSISTENT) != 0) {

                    hasValidSound = false;