Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix PermissionHelper NullPointerException" am: f8c768eef1 am: 58a5a80d8c

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

Change-Id: I63eb4a0e99c49f88668f1d58ab697ba3c000cb4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-11-17 22:08:06 +00:00
committed by Automerger Merge Worker
parent 8408b73560 58a5a80d8c
commit fb753bfc1d
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/notification/PermissionHelper.java
View File

@@ -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) {
return ArrayUtils.contains(permissions, NOTIFICATION_PERMISSION); String[] permissions = pi.requestedPermissions;
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);
} }