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

Commit abd36870 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Change flag to the new one for haptic customization of channel notification" into main

parents 78ef6514 3051af5f

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

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

        }



        if (com.android.server.notification.Flags.notificationVibrationInSoundUri()) {

        if (com.android.server.notification.Flags.notificationVibrationInSoundUriForChannel()) {

            final VibrationEffect vibrationEffectFromSoundUri =

                    helper.createVibrationEffectFromSoundUri(channel.getSound());

            if (vibrationEffectFromSoundUri != null) {

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

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



    @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 {

        defaultChannel.enableVibration(true);

        VibrationInfo vibration = getTestingVibration(mVibrator);