Commit 75126128 authored by Peter Kotwicz's avatar Peter Kotwicz Committed by Commit Bot

[Android WebAPK] Fix JNI DCHECK failure related to chrome://webapks

This CL fixes DCHECK failure when Chrome is navigated to chrome://webapks
and the user has not yet selected the host browser for one of the
installed WebAPKs

BUG=989200

Change-Id: Icee4087f6e3d05fa2ff43b9fbfe58f82477c8496
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1726901Reviewed-by: default avatarDominick Ng <dominickn@chromium.org>
Commit-Queue: Peter Kotwicz <pkotwicz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#682697}
parent 599c552d
......@@ -55,6 +55,12 @@ void WebApkHandlerDelegate::OnWebApkInfoRetrieved(
const JavaParamRef<jstring>& jbacking_browser_package_name,
const jboolean jis_backing_browser,
const JavaParamRef<jstring>& jupdate_status) {
std::string backing_browser_package_name;
if (jbacking_browser_package_name) {
backing_browser_package_name = base::android::ConvertJavaStringToUTF8(
env, jbacking_browser_package_name);
}
callback_.Run(WebApkInfo(
base::android::ConvertJavaStringToUTF8(env, jname),
base::android::ConvertJavaStringToUTF8(env, jshort_name),
......@@ -71,9 +77,7 @@ void WebApkHandlerDelegate::OnWebApkInfoRetrieved(
JavaColorToOptionalSkColor(jbackground_color),
base::Time::FromJavaTime(jlast_update_check_time_ms),
base::Time::FromJavaTime(jlast_update_completion_time_ms),
static_cast<bool>(jrelax_updates),
base::android::ConvertJavaStringToUTF8(env,
jbacking_browser_package_name),
static_cast<bool>(jrelax_updates), backing_browser_package_name,
static_cast<bool>(jis_backing_browser),
base::android::ConvertJavaStringToUTF8(env, jupdate_status)));
}
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