Merge "Fix RRO handleConfigurationChanged race condition" into sc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
55128109d9
@@ -158,10 +158,9 @@ class ConfigurationController {
|
|||||||
int configDiff;
|
int configDiff;
|
||||||
boolean equivalent;
|
boolean equivalent;
|
||||||
|
|
||||||
final Resources.Theme systemTheme = mActivityThread.getSystemContext().getTheme();
|
|
||||||
final Resources.Theme systemUiTheme = mActivityThread.getSystemUiContext().getTheme();
|
|
||||||
|
|
||||||
synchronized (mResourcesManager) {
|
synchronized (mResourcesManager) {
|
||||||
|
final Resources.Theme systemTheme = mActivityThread.getSystemContext().getTheme();
|
||||||
|
final Resources.Theme systemUiTheme = mActivityThread.getSystemUiContext().getTheme();
|
||||||
if (mPendingConfiguration != null) {
|
if (mPendingConfiguration != null) {
|
||||||
if (!mPendingConfiguration.isOtherSeqNewer(config)) {
|
if (!mPendingConfiguration.isOtherSeqNewer(config)) {
|
||||||
config = mPendingConfiguration;
|
config = mPendingConfiguration;
|
||||||
|
|||||||
Reference in New Issue
Block a user