Merge "Fix PermissionHelper NullPointerException" am: f8c768eef1 am: 58a5a80d8c
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:
@@ -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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user