Merge "Update sound/vibrate notification key only when it actually buzz/beep." am: 5432355d0c (065103f2) · Commits · e / os / android_frameworks_base

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

+6 −3

Original line number	Diff line number	Diff line
		@@ -4808,22 +4808,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;
		}
		}
		}
		}