Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix RRO handleConfigurationChanged race condition" into sc-dev am: 55128109d9 am: 7feeebf128

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

Change-Id: I89ffc921ddd85a2f033757b0b2bae019f2343ce1
This commit is contained in:
Ryan Mitchell
2021-06-10 20:05:15 +00:00
committed by Automerger Merge Worker
parent 314adf165e 7feeebf128
commit 564eb292d5
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/app/ConfigurationController.java
View File

@@ -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;