Merge "Actually use listener hints?" into pi-dev (d3b21794) · Commits · e / os / android_frameworks_base

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

+19 −0

Original line number	Diff line number	Diff line
		@@ -1245,6 +1245,11 @@ public class NotificationManagerService extends SystemService {
		mAudioManager = audioMananger;
		}

		@VisibleForTesting
		void setHints(int hints) {
		mListenerHints = hints;
		}

		@VisibleForTesting
		void setVibrator(Vibrator vibrator) {
		mVibrator = vibrator;
		@@ -3692,6 +3697,20 @@ public class NotificationManagerService extends SystemService {
		if ((mListenerHints & HINT_HOST_DISABLE_EFFECTS) != 0) {
		return "listenerHints";
		}
		if (record != null && record.getAudioAttributes() != null) {
		if ((mListenerHints & HINT_HOST_DISABLE_NOTIFICATION_EFFECTS) != 0) {
		if (record.getAudioAttributes().getUsage()
		!= AudioAttributes.USAGE_VOICE_COMMUNICATION) {
		return "listenerNoti";
		}
		}
		if ((mListenerHints & HINT_HOST_DISABLE_CALL_EFFECTS) != 0) {
		if (record.getAudioAttributes().getUsage()
		== AudioAttributes.USAGE_VOICE_COMMUNICATION) {
		return "listenerCall";
		}
		}
		}
		if (mCallState != TelephonyManager.CALL_STATE_IDLE && !mZenModeHelper.isCall(record)) {
		return "callState";
		}

services/tests/uiservicestests/src/com/android/server/notification/BuzzBeepBlinkTest.java

+7 −11

Original line number	Diff line number	Diff line
		@@ -58,6 +58,7 @@ import android.os.UserHandle;
		import android.os.VibrationEffect;
		import android.os.Vibrator;
		import android.provider.Settings;
		import android.service.notification.NotificationListenerService;
		import android.service.notification.StatusBarNotification;
		import android.support.test.runner.AndroidJUnit4;
		import android.test.suitebuilder.annotation.SmallTest;
		@@ -112,7 +113,7 @@ public class BuzzBeepBlinkTest extends UiServiceTestCase {
		private static final Uri CUSTOM_SOUND = Settings.System.DEFAULT_ALARM_ALERT_URI;
		private static final AudioAttributes CUSTOM_ATTRIBUTES = new AudioAttributes.Builder()
		.setContentType(AudioAttributes.CONTENT_TYPE_UNKNOWN)
		.setUsage(AudioAttributes.USAGE_NOTIFICATION_RINGTONE)
		.setUsage(AudioAttributes.USAGE_VOICE_COMMUNICATION)
		.build();
		private static final int CUSTOM_LIGHT_COLOR = Color.BLACK;
		private static final int CUSTOM_LIGHT_ON = 10000;
		@@ -230,11 +231,11 @@ public class BuzzBeepBlinkTest extends UiServiceTestCase {
		false /* noisy /, false / buzzy/, true / lights */);
		}

		private NotificationRecord getCustomLightsNotification() {
		return getNotificationRecord(mId, false /* insistent /, true / once */,
		false /* noisy /, true / buzzy/, true / lights */,
		true /* defaultVibration /, true / defaultSound /, false / defaultLights */,
		null, Notification.GROUP_ALERT_ALL, false);
		private NotificationRecord getCallRecord(int id, boolean insistent) {
		return getNotificationRecord(id, false, false /* once /, true / noisy */,
		false /* buzzy /, false / lights /, false / default vib */,
		false /* default sound /, false / default lights */, "",
		Notification.GROUP_ALERT_ALL, false);
		}

		private NotificationRecord getNotificationRecord(int id, boolean insistent, boolean once,
		@@ -344,11 +345,6 @@ public class BuzzBeepBlinkTest extends UiServiceTestCase {
		eq(false), (AudioAttributes) anyObject());
		}

		private void verifyCustomBeep() throws RemoteException {
		verify(mRingtonePlayer, times(1)).playAsync(eq(CUSTOM_SOUND), (UserHandle) anyObject(),
		eq(false), (AudioAttributes) anyObject());
		}

		private void verifyNeverStopAudio() throws RemoteException {
		verify(mRingtonePlayer, never()).stopAsync();
		}