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

Commit bf38944b authored by Julia Reynolds's avatar Julia Reynolds
Browse files

Fix NPE 

Test: NotificationRecordTest
Fixes: 334433005
Flag: android.app.restrict_audio_attributes_media(call/alarm)
Change-Id: I71b31d4e4a98146e5e2ece09bc0d6b356e0ab628
parent 6010d9e5

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

+5 −1
Original line number Diff line number Diff line
@@ -1166,7 +1166,11 @@ public final class NotificationRecord { 
            mVibration = calculateVibration();

            if (restrictAudioAttributesCall() || restrictAudioAttributesAlarm()

                    || restrictAudioAttributesMedia()) {

                if (channel.getAudioAttributes() != null) {

                    mAttributes = channel.getAudioAttributes();

                } else {

                    mAttributes = Notification.AUDIO_ATTRIBUTES_DEFAULT;

                }

            }

        }

    }

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

+29 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static android.app.NotificationManager.IMPORTANCE_DEFAULT; 
import static android.app.NotificationManager.IMPORTANCE_HIGH;

import static android.app.NotificationManager.IMPORTANCE_LOW;

import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED;

import static android.media.AudioAttributes.USAGE_ALARM;

import static android.service.notification.Adjustment.KEY_IMPORTANCE;

import static android.service.notification.Adjustment.KEY_NOT_CONVERSATION;

import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_ALERTING;
@@ -68,6 +69,7 @@ import android.os.Bundle; 
import android.os.UserHandle;

import android.os.VibrationEffect;

import android.os.Vibrator;

import android.platform.test.annotations.EnableFlags;

import android.platform.test.flag.junit.SetFlagsRule;

import android.provider.Settings;

import android.service.notification.Adjustment;
@@ -1565,4 +1567,31 @@ public class NotificationRecordTest extends UiServiceTestCase { 
        assertTrue(record.getPhoneNumbers().contains("16175552121"));

        assertTrue(record.getPhoneNumbers().contains("16175553434"));

    }



    @Test

    @EnableFlags(Flags.FLAG_RESTRICT_AUDIO_ATTRIBUTES_ALARM)

    public void updateChannel_nullAudioAttributes() {

        StatusBarNotification sbn = getStyledNotification(true, true, true,

                new Notification.DecoratedCustomViewStyle());

        NotificationRecord record = new NotificationRecord(mMockContext, sbn, channel);



        record.updateNotificationChannel(new NotificationChannel("new", "new", 3));



        assertThat(record.getAudioAttributes()).isNotNull();

    }



    @Test

    @EnableFlags(Flags.FLAG_RESTRICT_AUDIO_ATTRIBUTES_ALARM)

    public void updateChannel_nonNullAudioAttributes() {

        StatusBarNotification sbn = getStyledNotification(true, true, true,

                new Notification.DecoratedCustomViewStyle());

        NotificationRecord record = new NotificationRecord(mMockContext, sbn, channel);



        NotificationChannel update = new NotificationChannel("new", "new", 3);

        update.setSound(Uri.EMPTY,

                new AudioAttributes.Builder().setUsage(USAGE_ALARM).build());

        record.updateNotificationChannel(update);



        assertThat(record.getAudioAttributes().getUsage()).isEqualTo(USAGE_ALARM);

    }

}