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

Commit f56db3a0 authored by Ryan Mitchell's avatar Ryan Mitchell Committed by Automerger Merge Worker
Browse files

Merge "Fix RRO handleConfigurationChanged race condition" into sc-dev am: 55128109 am: 03a41e35 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14923667

Change-Id: I6a6f17c94ad4799b12eda73259e182d45e67cabd
parents e693508e 03a41e35

core/java/android/app/ConfigurationController.java

+2 −3
Original line number Original line Diff line number Diff line
@@ -158,10 +158,9 @@ class ConfigurationController { 
        int configDiff;

        int configDiff;

        boolean equivalent;

        boolean equivalent;





        synchronized (mResourcesManager) {

            final Resources.Theme systemTheme = mActivityThread.getSystemContext().getTheme();

            final Resources.Theme systemTheme = mActivityThread.getSystemContext().getTheme();

            final Resources.Theme systemUiTheme = mActivityThread.getSystemUiContext().getTheme();

            final Resources.Theme systemUiTheme = mActivityThread.getSystemUiContext().getTheme();



        synchronized (mResourcesManager) {

            if (mPendingConfiguration != null) {

            if (mPendingConfiguration != null) {

                if (!mPendingConfiguration.isOtherSeqNewer(config)) {

                if (!mPendingConfiguration.isOtherSeqNewer(config)) {

                    config = mPendingConfiguration;

                    config = mPendingConfiguration;