Android: Use createConfigurationContext() instead of applyOverrideConfiguration()

Attempting to roll appcompat support library, and it looks like the next version
breaks applyOverrideConfiguration(). Specifically,
AppCompatActivity.attachBaseContext() is now calling getResources(),
which triggers an assert in applyOverrideConfiguration() since it cannot
be called after a call to getResources().

I believe createConfigurationContext() should be functionally equivalent
to applyOverrideConfiguration().

Bug: 1064727
Change-Id: I2cd1f4c348b7b8e3815ae33bc8708f79308d40b6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2157676
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Theresa  <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#762128}

chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java

@@ -29,16 +29,16 @@ public class ChromeBaseAppCompatActivity
     private @StyleRes int mThemeResId;
 
     @Override
-    protected void attachBaseContext(Context newBase) {
-        super.attachBaseContext(newBase);
+    protected void attachBaseContext(Context baseContext) {
         mNightModeStateProvider = createNightModeStateProvider();
-
-        Configuration config = new Configuration();
         // Pre-Android O, fontScale gets initialized to 1 in the constructor. Set it to 0 so
-        // that applyOverrideConfiguration() does not interpret it as an overridden value.
+        // that it is not interpreted as an overridden value.
         // https://crbug.com/834191
-        config.fontScale = 0;
-        if (applyOverrides(newBase, config)) applyOverrideConfiguration(config);
+        Configuration overrideConfig = new Configuration();
+        overrideConfig.fontScale = 0;
+        applyConfigurationOverrides(baseContext, overrideConfig);
+
+        super.attachBaseContext(baseContext.createConfigurationContext(overrideConfig));
     }
 
     @Override
@@ -67,18 +67,13 @@ public class ChromeBaseAppCompatActivity
     }
 
     /**
-     * Called during {@link #attachBaseContext(Context)} to allow configuration overrides to be
-     * applied. If this methods return true, the overrides will be applied using
-     * {@link #applyOverrideConfiguration(Configuration)}.
+     * Called during {@link #attachBaseContext(Context)} to allow for configuration overrides.
      * @param baseContext The base {@link Context} attached to this class.
-     * @param overrideConfig The {@link Configuration} that will be passed to
-     *                       @link #applyOverrideConfiguration(Configuration)} if necessary.
-     * @return True if any configuration overrides were applied, and false otherwise.
+     * @return A Configuration object with overrides set.
      */
     @CallSuper
-    protected boolean applyOverrides(Context baseContext, Configuration overrideConfig) {
-        return NightModeUtils.applyOverridesForNightMode(
-                getNightModeStateProvider(), overrideConfig);
+    protected void applyConfigurationOverrides(Context baseContext, Configuration overrideConfig) {
+        NightModeUtils.applyOverridesForNightMode(mNightModeStateProvider, overrideConfig);
     }
 
     /**

chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitializationActivity.java

@@ -120,19 +120,22 @@ public abstract class AsyncInitializationActivity extends ChromeBaseAppCompatAct
 
     @Override
     @CallSuper
-    protected boolean applyOverrides(Context baseContext, Configuration overrideConfig) {
-        super.applyOverrides(baseContext, overrideConfig);
-
-        // We override the smallestScreenWidthDp here for two reasons:
-        // 1. To prevent multi-window from hiding the tabstrip when on a tablet.
-        // 2. To ensure mIsTablet only needs to be set once. Since the override lasts for the life
-        //    of the activity, it will never change via onConfigurationUpdated().
-        // See crbug.com/588838, crbug.com/662338, crbug.com/780593.
-        DisplayAndroid display = DisplayAndroid.getNonMultiDisplay(baseContext);
-        int targetSmallestScreenWidthDp =
-                DisplayUtil.pxToDp(display, DisplayUtil.getSmallestWidth(display));
-        overrideConfig.smallestScreenWidthDp = targetSmallestScreenWidthDp;
-        return true;
+    protected void applyConfigurationOverrides(Context baseContext, Configuration overrideConfig) {
+        super.applyConfigurationOverrides(baseContext, overrideConfig);
+        // Before Android M, an IllegalStateException is thrown for trying to access DisplayManager
+        // before attachBaseContext() has been called. Multi-window wasn't added until N, so it is
+        // unlikely for multi-window to be a large issue on Lollipop.
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            // We override the smallestScreenWidthDp here for two reasons:
+            // 1. To prevent multi-window from hiding the tabstrip when on a tablet.
+            // 2. To ensure mIsTablet only needs to be set once. Since the override lasts for the
+            //    life of the activity, it will never change via onConfigurationUpdated().
+            // See crbug.com/588838, crbug.com/662338, crbug.com/780593.
+            DisplayAndroid display = DisplayAndroid.getNonMultiDisplay(baseContext);
+            int targetSmallestScreenWidthDp =
+                    DisplayUtil.pxToDp(display, DisplayUtil.getSmallestWidth(display));
+            overrideConfig.smallestScreenWidthDp = targetSmallestScreenWidthDp;
+        }
     }
 
     @Override