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 am: fb753bfc1d

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

Change-Id: I471532beae916740f39cb6c9ae8646c41c190fed
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:14:20 +00:00
committed by Automerger Merge Worker
parent b52f5f9a2f fb753bfc1d
commit ae649a1af2
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,
@UserIdInt int userId) {
try {
String[] permissions = mPackageManager.getPackageInfo(packageName, GET_PERMISSIONS,
userId).requestedPermissions;
return ArrayUtils.contains(permissions, NOTIFICATION_PERMISSION);
PackageInfo pi = mPackageManager.getPackageInfo(packageName, GET_PERMISSIONS, userId);
if (pi != null) {
String[] permissions = pi.requestedPermissions;
return ArrayUtils.contains(permissions, NOTIFICATION_PERMISSION);
}
} catch (RemoteException e) {
Slog.e(TAG, "Could not reach system server", e);
}