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

Commit 457a7c50 authored by Fiona Campbell's avatar Fiona Campbell Committed by Automerger Merge Worker
Browse files

Merge "Prevent race condition by foregroundAppPackageName" into tm-qpr-dev am:... 

Merge "Prevent race condition by foregroundAppPackageName" into tm-qpr-dev am: 4a20c736 am: 7ee93d37

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



Change-Id: I1b5667c970c5bd2c419e71c42f256f47b8584945
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d350936e 7ee93d37

services/core/java/com/android/server/display/AutomaticBrightnessController.java

+3 −2
Original line number Diff line number Diff line
@@ -1008,8 +1008,9 @@ class AutomaticBrightnessController { 
                    final String packageName = info.topActivity.getPackageName();

                    // If the app didn't change, there's nothing to do. Otherwise, we have to

                    // update the category and re-apply the brightness correction.

                    if (mForegroundAppPackageName != null

                            && mForegroundAppPackageName.equals(packageName)) {

                    String currentForegroundAppPackageName = mForegroundAppPackageName;

                    if (currentForegroundAppPackageName != null

                            && currentForegroundAppPackageName.equals(packageName)) {

                        return;

                    }

                    mPendingForegroundAppPackageName = packageName;