Merge "Fix RRO handleConfigurationChanged race condition" into sc-dev

This commit is contained in:
Ryan Mitchell
2021-06-10 19:49:40 +00:00
committed by Android (Google) Code Review

View File

@@ -158,10 +158,9 @@ class ConfigurationController {
int configDiff;
boolean equivalent;
final Resources.Theme systemTheme = mActivityThread.getSystemContext().getTheme();
final Resources.Theme systemUiTheme = mActivityThread.getSystemUiContext().getTheme();
synchronized (mResourcesManager) {
final Resources.Theme systemTheme = mActivityThread.getSystemContext().getTheme();
final Resources.Theme systemUiTheme = mActivityThread.getSystemUiContext().getTheme();
if (mPendingConfiguration != null) {
if (!mPendingConfiguration.isOtherSeqNewer(config)) {
config = mPendingConfiguration;