diff options
| -rw-r--r-- | services/core/java/com/android/server/display/color/ColorDisplayService.java | 8 | ||||
| -rw-r--r-- | services/core/java/com/android/server/display/whitebalance/DisplayWhiteBalanceController.java | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/display/color/ColorDisplayService.java b/services/core/java/com/android/server/display/color/ColorDisplayService.java index a7d0a5c706b6..f599adb5118a 100644 --- a/services/core/java/com/android/server/display/color/ColorDisplayService.java +++ b/services/core/java/com/android/server/display/color/ColorDisplayService.java @@ -1241,6 +1241,14 @@ public final class ColorDisplayService extends SystemService { } /** + * Reset the CCT value for the display white balance transform to its default value. + */ + public boolean resetDisplayWhiteBalanceColorTemperature() { + return setDisplayWhiteBalanceColorTemperature(getContext().getResources() + .getInteger(R.integer.config_displayWhiteBalanceColorTemperatureDefault)); + } + + /** * Sets the listener and returns whether display white balance is currently enabled. */ public boolean setDisplayWhiteBalanceListener(DisplayWhiteBalanceListener listener) { diff --git a/services/core/java/com/android/server/display/whitebalance/DisplayWhiteBalanceController.java b/services/core/java/com/android/server/display/whitebalance/DisplayWhiteBalanceController.java index c32ae97da14f..0f86b478468f 100644 --- a/services/core/java/com/android/server/display/whitebalance/DisplayWhiteBalanceController.java +++ b/services/core/java/com/android/server/display/whitebalance/DisplayWhiteBalanceController.java @@ -405,6 +405,7 @@ public class DisplayWhiteBalanceController implements mThrottler.clear(); mAmbientColorTemperature = -1.0f; mPendingAmbientColorTemperature = -1.0f; + mColorDisplayServiceInternal.resetDisplayWhiteBalanceColorTemperature(); return true; } |