Commit 5d4f87d1 authored by Trevor Perrier's avatar Trevor Perrier Committed by Commit Bot

[Android] Clean up AppLocale logging and unused code

This CL removes two things related to native resources not loading with
an override locale.

- First, logging on ResourceBundle paths is removed.
- Second, a call to SplitCompat.installActivity that was added to try
to fix the issue but did not work is removed.

Bug: 1143026
Change-Id: I4136be98ca5103d91cc1340fd6252b513ab63e41
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2531661
Auto-Submit: Trevor  Perrier <perrier@chromium.org>
Reviewed-by: default avatarAndrew Grieve <agrieve@chromium.org>
Reviewed-by: default avatarTheresa  <twellington@chromium.org>
Commit-Queue: Theresa  <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#826888}
parent 1ff9e2f4
......@@ -36,7 +36,6 @@ import org.chromium.chrome.browser.dependency_injection.DaggerChromeAppComponent
import org.chromium.chrome.browser.dependency_injection.ModuleFactoryOverrides;
import org.chromium.chrome.browser.flags.CachedFeatureFlags;
import org.chromium.chrome.browser.flags.ChromeFeatureList;
import org.chromium.chrome.browser.language.AppLocaleUtils;
import org.chromium.chrome.browser.language.GlobalAppLocaleController;
import org.chromium.chrome.browser.metrics.UmaUtils;
import org.chromium.chrome.browser.night_mode.SystemNightModeMonitor;
......@@ -128,11 +127,6 @@ public class ChromeApplication extends SplitCompatApplication {
// Initializes the support for dynamic feature modules (browser only).
ModuleUtil.initApplication();
// Native resources are loaded from the application context in ContextUtils. These
// are need for app locale overrides, so ensure SplitCompat.installActivity is
// called on this context for bundle builds.
AppLocaleUtils.maybeInstallActivitySplitCompat(context);
// Set Chrome factory for mapping BackgroundTask classes to TaskIds.
ChromeBackgroundTaskFactory.setAsDefault();
......
......@@ -103,10 +103,8 @@ public final class ResourceBundle {
// The file may not exist if the language split for this locale has not been installed
// yet, so make sure it exists before returning the asset path.
try (AssetFileDescriptor afd = manager.openNonAssetFd(assetPath)) {
Log.i(TAG, "Found: %s", assetPath);
return assetPath;
} catch (IOException e) {
Log.e(TAG, "Not found: %s", assetPath);
if (logError) {
Log.e(TAG, "path=%s", assetPath, e);
}
......
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