Merge "Fix PermissionHelper NullPointerException" am: f8c768eef1

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

Change-Id: I2e07440b079368b506714a1076fe40dda39ae0d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-11-17 21:44:07 +00:00
committed by Automerger Merge Worker

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);
}