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

Commit 3051af5f authored Oct 14, 2024 by yumeichen

Change flag to the new one for haptic customization of channel notification

Flag: com.android.server.notification.notification_vibration_in_sound_uri_for_channel
Test: atest NotificationRecordTest
Bug: 351975435
Change-Id: I83089bbce6e586da6f7ce3ac5694f8a2be981768

Change-Id: Id14c4d9e90f4b75bcb6efc13963f56246bbef80f

parent ec8b32dc

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -334,7 +334,7 @@ public final class NotificationRecord {
	return helper.createWaveformVibration(vibrationPattern, insistent);		return helper.createWaveformVibration(vibrationPattern, insistent);
	}		}

	if (com.android.server.notification.Flags.notificationVibrationInSoundUri()) {		if (com.android.server.notification.Flags.notificationVibrationInSoundUriForChannel()) {
	final VibrationEffect vibrationEffectFromSoundUri =		final VibrationEffect vibrationEffectFromSoundUri =
	helper.createVibrationEffectFromSoundUri(channel.getSound());		helper.createVibrationEffectFromSoundUri(channel.getSound());
	if (vibrationEffectFromSoundUri != null) {		if (vibrationEffectFromSoundUri != null) {

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

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -546,7 +546,8 @@ public class NotificationRecordTest extends UiServiceTestCase {
	}		}

	@Test		@Test
	@EnableFlags(com.android.server.notification.Flags.FLAG_NOTIFICATION_VIBRATION_IN_SOUND_URI)		@EnableFlags(com.android.server.notification.Flags
			.FLAG_NOTIFICATION_VIBRATION_IN_SOUND_URI_FOR_CHANNEL)
	public void testVibration_customVibrationForSound_withVibrationUri() throws IOException {		public void testVibration_customVibrationForSound_withVibrationUri() throws IOException {
	defaultChannel.enableVibration(true);		defaultChannel.enableVibration(true);
	VibrationInfo vibration = getTestingVibration(mVibrator);		VibrationInfo vibration = getTestingVibration(mVibrator);