commit ecc978f314bbf0a920fd4147285309da4346d880
author Kenny Guy <kennyguy@google.com> Wed Mar 14 17:30:20 2018 +0000
committer Kenny Guy <kennyguy@google.com> Tue Mar 27 13:05:23 2018 +0100
tree a923ee5ccb9bf6b625ce0ca5a46ce2c70ae7a889
parent b7ad5e429f7ec16bb0c35e1aed9e0e7a87a78f65

Don't treat user switch as slider interaction.

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

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

diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java
index fa39ce4..2beef5b 100644
--- a/services/core/java/com/android/server/display/DisplayPowerController.java
+++ b/services/core/java/com/android/server/display/DisplayPowerController.java
@@ -500,7 +500,7 @@
     }
 
     public void onSwitchUser(@UserIdInt int newUserId) {
-        handleSettingsChange();
+        handleSettingsChange(true /* userSwitch */);
         mBrightnessTracker.onSwitchUser(newUserId);
     }
 
@@ -1416,8 +1416,12 @@
         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 @@
 
         @Override
         public void onChange(boolean selfChange, Uri uri) {
-            handleSettingsChange();
+            handleSettingsChange(false /* userSwitch */);
         }
     }