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

Commit 119a7f55 authored by Ryan Mitchell's avatar Ryan Mitchell
Browse files

Fix RRO handleConfigurationChanged race condition 

Retrieval of the system and system UI themes should be done with the
ResourcesManager lock held to ensure the theme retrieved has the new
overlays applied.

Bug: 189100984
Test: manual
Change-Id: Ibe27ec745ea5a914d3d05e393598a336d96a55e6
parent 72cd5f15

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;