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

Commit ecc978f3 authored by Kenny Guy's avatar Kenny Guy
Browse files

Don't treat user switch as slider interaction. 

Bug: 73825714
Test: Manual, switch users check event not in dumpsys display.
Change-Id: I1a8c3bfe713b160ffe1268350a616c72f794e579
parent b7ad5e42

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

+7 −3
Original line number Diff line number Diff line
@@ -500,7 +500,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
    }



    public void onSwitchUser(@UserIdInt int newUserId) {

        handleSettingsChange();

        handleSettingsChange(true /* userSwitch */);

        mBrightnessTracker.onSwitchUser(newUserId);

    }
@@ -1416,8 +1416,12 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
        mHandler.post(mOnStateChangedRunnable);

    }



    private void handleSettingsChange() {

    private void handleSettingsChange(boolean userSwitch) {

        mPendingScreenBrightnessSetting = getScreenBrightnessSetting();

        if (userSwitch) {

            // Don't treat user switches as user initiated change.

            mCurrentScreenBrightnessSetting = mPendingScreenBrightnessSetting;

        }

        mPendingAutoBrightnessAdjustment = getAutoBrightnessAdjustmentSetting();

        // We don't bother with a pending variable for VR screen brightness since we just

        // immediately adapt to it.
@@ -1731,7 +1735,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 


        @Override

        public void onChange(boolean selfChange, Uri uri) {

            handleSettingsChange();

            handleSettingsChange(false /* userSwitch */);

        }

    }