Commit 4bc01f47 authored by Nate Fischer's avatar Nate Fischer Committed by Commit Bot

AW: fix String comparison in shell

No change to production logic, only WebView shell.

This changes a String comparison to use `.equals()` instead of `==`. We
were already returning the same String object, so reference comparison
was probably technically correct as-written, but this change gets rid of
a compile warning from errorprone.

Change-Id: Iaa763f9f48173fd39831a17485ae9ac70dc0cf98
Reviewed-on: https://chromium-review.googlesource.com/745244Reviewed-by: default avatarPaul Miller <paulmiller@chromium.org>
Reviewed-by: default avatarBo <boliu@chromium.org>
Commit-Queue: Nate Fischer <ntfschr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#512897}
parent 9e03b4de
...@@ -343,7 +343,7 @@ public class WebViewBrowserActivity extends Activity implements PopupMenu.OnMenu ...@@ -343,7 +343,7 @@ public class WebViewBrowserActivity extends Activity implements PopupMenu.OnMenu
@TargetApi(Build.VERSION_CODES.M) @TargetApi(Build.VERSION_CODES.M)
private boolean canGrant(String webkitPermission) { private boolean canGrant(String webkitPermission) {
String androidPermission = sPermissions.get(webkitPermission); String androidPermission = sPermissions.get(webkitPermission);
if (androidPermission == NO_ANDROID_PERMISSION) { if (androidPermission.equals(NO_ANDROID_PERMISSION)) {
return true; return true;
} }
return PackageManager.PERMISSION_GRANTED == checkSelfPermission(androidPermission); return PackageManager.PERMISSION_GRANTED == checkSelfPermission(androidPermission);
......
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