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

Commit 34560ec2 authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Merge "Fix potential NPE"

parents 6f0b03d3 34a80841

core/java/android/app/NotificationManager.java

+5 −2
Original line number Diff line number Diff line
@@ -1636,11 +1636,14 @@ public class NotificationManager { 
        try {

            final ParceledListSlice<StatusBarNotification> parceledList

                    = service.getAppActiveNotifications(pkg, mContext.getUserId());

            if (parceledList != null) {

                final List<StatusBarNotification> list = parceledList.getList();

                return list.toArray(new StatusBarNotification[list.size()]);

            }

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

        return new StatusBarNotification[0];

    }



    /**