diff options
| author | Neil Fuller <nfuller@google.com> | 2014-10-02 10:18:29 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-02 10:18:29 +0000 |
| commit | ee665151a4c6359cbfbb9a6795aa9097c4622083 (patch) | |
| tree | 42274866ba592cd70031f4e32f7e3a9399d38a35 /services/java/com/android/server/power/DisplayPowerController.java | |
| parent | 152d9aae631381ea28f5701168d372a1486a7502 (diff) | |
| parent | 0c1faf43aecadc37b78c4ad6cb669eb351d21385 (diff) | |
| download | frameworks_base-ee665151a4c6359cbfbb9a6795aa9097c4622083.zip frameworks_base-ee665151a4c6359cbfbb9a6795aa9097c4622083.tar.gz frameworks_base-ee665151a4c6359cbfbb9a6795aa9097c4622083.tar.bz2 | |
am 0c1faf43: Merge "Switch from FloatMath -> Math and Math.hypot where possible"
* commit '0c1faf43aecadc37b78c4ad6cb669eb351d21385':
Switch from FloatMath -> Math and Math.hypot where possible
Diffstat (limited to 'services/java/com/android/server/power/DisplayPowerController.java')
| -rw-r--r-- | services/java/com/android/server/power/DisplayPowerController.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/services/java/com/android/server/power/DisplayPowerController.java b/services/java/com/android/server/power/DisplayPowerController.java index 30bc922..389880a 100644 --- a/services/java/com/android/server/power/DisplayPowerController.java +++ b/services/java/com/android/server/power/DisplayPowerController.java @@ -35,7 +35,6 @@ import android.os.Message; import android.os.PowerManager; import android.os.SystemClock; import android.text.format.DateUtils; -import android.util.FloatMath; import android.util.Slog; import android.util.Spline; import android.util.TimeUtils; @@ -1092,7 +1091,7 @@ final class DisplayPowerController { if (USE_SCREEN_AUTO_BRIGHTNESS_ADJUSTMENT && mPowerRequest.screenAutoBrightnessAdjustment != 0.0f) { - final float adjGamma = FloatMath.pow(SCREEN_AUTO_BRIGHTNESS_ADJUSTMENT_MAX_GAMMA, + final float adjGamma = (float) Math.pow(SCREEN_AUTO_BRIGHTNESS_ADJUSTMENT_MAX_GAMMA, Math.min(1.0f, Math.max(-1.0f, -mPowerRequest.screenAutoBrightnessAdjustment))); gamma *= adjGamma; @@ -1119,7 +1118,7 @@ final class DisplayPowerController { if (gamma != 1.0f) { final float in = value; - value = FloatMath.pow(value, gamma); + value = (float) Math.pow(value, gamma); if (DEBUG) { Slog.d(TAG, "updateAutoBrightness: gamma=" + gamma + ", in=" + in + ", out=" + value); |