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

Commit 564eb292 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: 7feeebf1 

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

Change-Id: I89ffc921ddd85a2f033757b0b2bae019f2343ce1
parents 314adf16 7feeebf1

core/java/android/app/ConfigurationController.java

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

        boolean equivalent;



        synchronized (mResourcesManager) {

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

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



        synchronized (mResourcesManager) {

            if (mPendingConfiguration != null) {

                if (!mPendingConfiguration.isOtherSeqNewer(config)) {

                    config = mPendingConfiguration;