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

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

Change-Id: I0223ae25eaccbb5357b6738e0b75df7c534a72a3
This commit is contained in:
Ryan Mitchell
2021-06-10 19:52:00 +00:00
committed by Automerger Merge Worker
parent 4030a4bc5c 55128109d9
commit 0b81d98549
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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