Commit 8f260520 authored by Reilly Grant's avatar Reilly Grant Committed by Commit Bot

[Android] Add missing null check in createPermissionClickCallback

In r745013 we introduced a case where createPermissionClickCallback()
can be called with both a null intentOverride and androidPermissions.
This change adds the missing null check.

Bug: 1058746
Change-Id: I5971f20b18b193ba664ab8f24a0a03841da32b79
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2090174Reviewed-by: default avatarTed Choc <tedchoc@chromium.org>
Commit-Queue: Reilly Grant <reillyg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#747477}
parent f3cb33fc
...@@ -212,7 +212,8 @@ class PermissionParamsListBuilder { ...@@ -212,7 +212,8 @@ class PermissionParamsListBuilder {
private Runnable createPermissionClickCallback( private Runnable createPermissionClickCallback(
Intent intentOverride, String[] androidPermissions) { Intent intentOverride, String[] androidPermissions) {
return () -> { return () -> {
if (intentOverride == null && mPermissionDelegate != null) { if (intentOverride == null && androidPermissions != null
&& mPermissionDelegate != null) {
// Try and immediately request missing Android permissions where possible. // Try and immediately request missing Android permissions where possible.
for (int i = 0; i < androidPermissions.length; i++) { for (int i = 0; i < androidPermissions.length; i++) {
if (!mPermissionDelegate.canRequestPermission(androidPermissions[i])) continue; if (!mPermissionDelegate.canRequestPermission(androidPermissions[i])) continue;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment