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

Commit 39473b75 authored by Rupesh Bansal's avatar Rupesh Bansal Committed by Automerger Merge Worker
Browse files

Merge "Fix the issue of null previous brightness reason in the logs" into udc-dev am: 9cbb43e7 

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



Change-Id: I4ce6cb71c12bad63e729ad81472bb3ba2a496ac5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6db555e9 9cbb43e7

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

+1 −0
Original line number Diff line number Diff line
@@ -1148,6 +1148,7 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
        final int previousPolicy;

        boolean mustInitialize = false;

        int brightnessAdjustmentFlags = 0;

        mBrightnessReasonTemp.set(null);

        mTempBrightnessEvent.reset();

        SparseArray<DisplayPowerControllerInterface> displayBrightnessFollowers;

        synchronized (mLock) {

services/core/java/com/android/server/display/brightness/BrightnessEvent.java

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ public final class BrightnessEvent { 
     * A utility to reset the BrightnessEvent to default values

     */

    public void reset() {

        mReason.set(null);

        mReason = new BrightnessReason();

        mTime = SystemClock.uptimeMillis();

        mPhysicalDisplayId = "";

        // Lux values