commit 046e0a7ba68c95e303842812e835e0f321e8d892
author Michael Wright <michaelwr@google.com> Thu Mar 20 01:15:38 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 20 01:15:39 2014 +0000
tree 3ba42bc38656a182440f8e4ff7215589d6399abc
parent d0abcedece5c749129af89cf096534c98a716d89
parent e5659baa4f439865658d11d6617773e0849f22a2

Merge "Use DisplayPowerRequest#wantLightSensorEnabled in ABC."

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

diff --git a/services/core/java/com/android/server/power/AutomaticBrightnessController.java b/services/core/java/com/android/server/power/AutomaticBrightnessController.java
index 3ca628a..807262a 100644
--- a/services/core/java/com/android/server/power/AutomaticBrightnessController.java
+++ b/services/core/java/com/android/server/power/AutomaticBrightnessController.java
@@ -200,8 +200,7 @@
 
     public void updatePowerState(DisplayPowerRequest request) {
         if (setScreenAutoBrightnessAdjustment(request.screenAutoBrightnessAdjustment)
-                || setLightSensorEnabled(request.useAutoBrightness
-                    && request.wantScreenOnNormal())) {
+                || setLightSensorEnabled(request.wantLightSensorEnabled())) {
             updateAutoBrightness(false /*sendUpdate*/);
         }
     }