Commit 03cc9448 authored by Alexei Svitkine's avatar Alexei Svitkine

Speculative workaround fix for locale CHECK failure on Android.

Bug: 912320
Change-Id: I2f6367902a43a211459442897ec277effd8fc402
Reviewed-on: https://chromium-review.googlesource.com/c/1368032
Commit-Queue: Alexei Svitkine <asvitkine@chromium.org>
Reviewed-by: default avatarXi Han <hanxi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#614758}
parent e9006cf9
......@@ -426,6 +426,14 @@ void VariationsService::EnsureLocaleEquals(const std::string& locale) {
// Chrome OS may switch language on the fly.
DCHECK_EQ(locale, field_trial_creator_.application_locale());
#else
#if defined(OS_ANDROID)
// TODO(asvitkine): Speculative early return to silence CHECK failures on
// Android, see crbug.com/912320.
if (locale.empty())
return;
#endif
// Uses a CHECK rather than a DCHECK to ensure that issues are caught since
// problems in this area may only appear in the wild due to official builds
// and end user machines.
......
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