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

Commit 58a5a80d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix PermissionHelper NullPointerException" am: f8c768ee 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2222844



Change-Id: I2e07440b079368b506714a1076fe40dda39ae0d0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 13cf655c f8c768ee

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

+5 −3
Original line number Original line Diff line number Diff line
@@ -261,9 +261,11 @@ public final class PermissionHelper { 
    private boolean packageRequestsNotificationPermission(String packageName,

    private boolean packageRequestsNotificationPermission(String packageName,

            @UserIdInt int userId) {

            @UserIdInt int userId) {

        try {

        try {

            String[] permissions = mPackageManager.getPackageInfo(packageName, GET_PERMISSIONS,

            PackageInfo pi = mPackageManager.getPackageInfo(packageName, GET_PERMISSIONS, userId);

                    userId).requestedPermissions;

            if (pi != null) {

                String[] permissions = pi.requestedPermissions;

                return ArrayUtils.contains(permissions, NOTIFICATION_PERMISSION);

                return ArrayUtils.contains(permissions, NOTIFICATION_PERMISSION);

            }

        } catch (RemoteException e) {

        } catch (RemoteException e) {

            Slog.e(TAG, "Could not reach system server", e);

            Slog.e(TAG, "Could not reach system server", e);

        }

        }