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

Commit 8dab255f authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk
Browse files

NotificationChannelExtractor: don't crash on missing AudioAttributes 

Bug: N/A
Test: grep logcat against NullPointerException on CF Auto
Flag: EXEMPT bugfix
Change-Id: I4f9f24def13a476b471934727deb90b526051a78
parent 35cc5931

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

+6 −1
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ import android.content.Context; 
import android.media.AudioAttributes;

import android.os.Binder;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.util.Slog;



import com.android.internal.compat.IPlatformCompat;



/**
@@ -79,6 +79,11 @@ public class NotificationChannelExtractor implements NotificationSignalExtractor 
        if (restrictAudioAttributesCall() || restrictAudioAttributesAlarm()

                || restrictAudioAttributesMedia()) {

            AudioAttributes attributes = record.getChannel().getAudioAttributes();

            if (attributes == null) {

                if (DBG) Slog.d(TAG, "missing AudioAttributes");

                return null;

            }



            boolean updateAttributes =  false;

            if (restrictAudioAttributesCall()

                    && !record.getNotification().isStyle(Notification.CallStyle.class)