Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ad1b489 authored by Adam Lesinski's avatar Adam Lesinski
Browse files

Fix issue with overridden configuration in onConfigurationChanged 

When using applyOverrideConfiguration, subsequent callbacks to
onConfigurationChanged didn't take into account the locally overridden
configuration. This patches the incoming configuration to match
what is expected by the application.

Bug:27644297
Change-Id: I3a090e9862a56470d999aa0aa4d5bae29f533a11
parent c83ce39a

core/java/android/app/ActivityThread.java

+16 −1
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ import android.util.PrintWriterPrinter; 
import android.util.Slog;

import android.util.SparseIntArray;

import android.util.SuperNotCalledException;

import android.view.ContextThemeWrapper;

import android.view.Display;

import android.view.ThreadedRenderer;

import android.view.View;
@@ -4632,7 +4633,21 @@ public final class ActivityThread { 
            }



            if (reportToActivity) {

                cb.onConfigurationChanged(newConfig);

                Configuration configToReport = newConfig;



                if (cb instanceof ContextThemeWrapper) {

                    // ContextThemeWrappers may override the configuration for that context.

                    // We must check and apply any overrides defined.

                    ContextThemeWrapper contextThemeWrapper = (ContextThemeWrapper) cb;

                    final Configuration localOverrideConfig =

                            contextThemeWrapper.getOverrideConfiguration();

                    if (localOverrideConfig != null) {

                        configToReport = new Configuration(newConfig);

                        configToReport.updateFrom(localOverrideConfig);

                    }

                }



                cb.onConfigurationChanged(configToReport);

            }



            if (activity != null) {

core/java/android/view/ContextThemeWrapper.java

+9 −0
Original line number Diff line number Diff line
@@ -101,6 +101,15 @@ public class ContextThemeWrapper extends ContextWrapper { 
        mOverrideConfiguration = new Configuration(overrideConfiguration);

    }



    /**

     * Used by ActivityThread to apply the overridden configuration to onConfigurationChange

     * callbacks.

     * @hide

     */

    public Configuration getOverrideConfiguration() {

        return mOverrideConfiguration;

    }



    @Override

    public AssetManager getAssets() {

        // Ensure we're returning assets with the correct configuration.