Merge "Update sound/vibrate notification key only when it actually buzz/beep." (5432355d) · Commits · e / os / android_frameworks_base

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

+6 −3

Original line number	Original line	Diff line number	Diff line
	@@ -4807,22 +4807,25 @@ public class NotificationManagerService extends SystemService {
	}		}
	if (DBG) Slog.v(TAG, "Interrupting!");		if (DBG) Slog.v(TAG, "Interrupting!");
	if (hasValidSound) {		if (hasValidSound) {
	mSoundNotificationKey = key;
	if (mInCall) {		if (mInCall) {
	playInCallNotification();		playInCallNotification();
	beep = true;		beep = true;
	} else {		} else {
	beep = playSound(record, soundUri);		beep = playSound(record, soundUri);
	}		}
			if(beep) {
			mSoundNotificationKey = key;
			}
	}		}

	final boolean ringerModeSilent =		final boolean ringerModeSilent =
	mAudioManager.getRingerModeInternal()		mAudioManager.getRingerModeInternal()
	== AudioManager.RINGER_MODE_SILENT;		== AudioManager.RINGER_MODE_SILENT;
	if (!mInCall && hasValidVibrate && !ringerModeSilent) {		if (!mInCall && hasValidVibrate && !ringerModeSilent) {
	mVibrateNotificationKey = key;

	buzz = playVibration(record, vibration, hasValidSound);		buzz = playVibration(record, vibration, hasValidSound);
			if(buzz) {
			mVibrateNotificationKey = key;
			}
	}		}
	}		}
	}		}