Commit 5f07f9d3 authored by Lijin Shen's avatar Lijin Shen Committed by Commit Bot

Fix NPE when web activity can not be resolved for default browser promo

PackageManagerUtils##resolveDefaultWebBrowserActivity can return null.
Add one more check to prevent NPE.

Bug: 1131772
Change-Id: I93cd791b00c675d2d797fdcde76ca5fedd0a50a5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2427138Reviewed-by: default avatarPavel Yatsuk <pavely@chromium.org>
Reviewed-by: default avatarTheresa  <twellington@chromium.org>
Commit-Queue: Lijin Shen <lazzzis@google.com>
Cr-Commit-Position: refs/heads/master@{#810265}
parent 6721c58c
...@@ -16,8 +16,6 @@ import android.os.Build; ...@@ -16,8 +16,6 @@ import android.os.Build;
import android.provider.Settings; import android.provider.Settings;
import android.text.TextUtils; import android.text.TextUtils;
import androidx.annotation.NonNull;
import org.chromium.base.CommandLine; import org.chromium.base.CommandLine;
import org.chromium.base.ContextUtils; import org.chromium.base.ContextUtils;
import org.chromium.base.PackageManagerUtils; import org.chromium.base.PackageManagerUtils;
...@@ -125,8 +123,8 @@ public class DefaultBrowserPromoDeps { ...@@ -125,8 +123,8 @@ public class DefaultBrowserPromoDeps {
} }
@DefaultBrowserState @DefaultBrowserState
int getCurrentDefaultBrowserState(@NonNull ResolveInfo info) { int getCurrentDefaultBrowserState(ResolveInfo info) {
if (info.match == 0) return DefaultBrowserState.NO_DEFAULT; // no default if (info == null || info.match == 0) return DefaultBrowserState.NO_DEFAULT; // no default
if (TextUtils.equals(ContextUtils.getApplicationContext().getPackageName(), if (TextUtils.equals(ContextUtils.getApplicationContext().getPackageName(),
info.activityInfo.packageName)) { info.activityInfo.packageName)) {
return DefaultBrowserState.CHROME_DEFAULT; // Already default return DefaultBrowserState.CHROME_DEFAULT; // Already default
......
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