From cae6c351b7304fd9807726b4173853a8d86a4391 Mon Sep 17 00:00:00 2001 From: Kenny Guy Date: Mon, 20 Jan 2020 14:56:00 +0000 Subject: [PATCH] Update brightness configuration per API review. Add Millis to methods that deal with milliseconds. Bug: 147835087 Test: atest BrightnessConfigurationTest Test: atest AutomaticBrightnessControllerTest Change-Id: Ib959762a2fb54efb965252071953c8af46403961 --- api/system-current.txt | 4 ++-- api/test-current.txt | 4 ++-- .../hardware/display/BrightnessConfiguration.java | 12 ++++++------ .../display/BrightnessConfigurationTest.java | 6 +++--- .../server/display/BrightnessMappingStrategy.java | 8 ++++---- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/api/system-current.txt b/api/system-current.txt index dfa0a23fa6a1a..edc529cfe3de0 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -2476,7 +2476,7 @@ package android.hardware.display { method @Nullable public android.hardware.display.BrightnessCorrection getCorrectionByPackageName(@NonNull String); method public android.util.Pair getCurve(); method public float getShortTermModelLowerLuxMultiplier(); - method public long getShortTermModelTimeout(); + method public long getShortTermModelTimeoutMillis(); method public float getShortTermModelUpperLuxMultiplier(); method public boolean shouldCollectColorSamples(); method public void writeToParcel(android.os.Parcel, int); @@ -2493,7 +2493,7 @@ package android.hardware.display { method public int getMaxCorrectionsByPackageName(); method @NonNull public android.hardware.display.BrightnessConfiguration.Builder setDescription(@Nullable String); method @NonNull public android.hardware.display.BrightnessConfiguration.Builder setShortTermModelLowerLuxMultiplier(@FloatRange(from=0.0f) float); - method @NonNull public android.hardware.display.BrightnessConfiguration.Builder setShortTermModelTimeout(long); + method @NonNull public android.hardware.display.BrightnessConfiguration.Builder setShortTermModelTimeoutMillis(long); method @NonNull public android.hardware.display.BrightnessConfiguration.Builder setShortTermModelUpperLuxMultiplier(@FloatRange(from=0.0f) float); method @NonNull public android.hardware.display.BrightnessConfiguration.Builder setShouldCollectColorSamples(boolean); } diff --git a/api/test-current.txt b/api/test-current.txt index 1db4c9b82343d..e093099aeac90 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -1078,7 +1078,7 @@ package android.hardware.display { method @Nullable public android.hardware.display.BrightnessCorrection getCorrectionByPackageName(@NonNull String); method public android.util.Pair getCurve(); method public float getShortTermModelLowerLuxMultiplier(); - method public long getShortTermModelTimeout(); + method public long getShortTermModelTimeoutMillis(); method public float getShortTermModelUpperLuxMultiplier(); method public boolean shouldCollectColorSamples(); method public void writeToParcel(android.os.Parcel, int); @@ -1095,7 +1095,7 @@ package android.hardware.display { method public int getMaxCorrectionsByPackageName(); method @NonNull public android.hardware.display.BrightnessConfiguration.Builder setDescription(@Nullable String); method @NonNull public android.hardware.display.BrightnessConfiguration.Builder setShortTermModelLowerLuxMultiplier(@FloatRange(from=0.0f) float); - method @NonNull public android.hardware.display.BrightnessConfiguration.Builder setShortTermModelTimeout(long); + method @NonNull public android.hardware.display.BrightnessConfiguration.Builder setShortTermModelTimeoutMillis(long); method @NonNull public android.hardware.display.BrightnessConfiguration.Builder setShortTermModelUpperLuxMultiplier(@FloatRange(from=0.0f) float); method @NonNull public android.hardware.display.BrightnessConfiguration.Builder setShouldCollectColorSamples(boolean); } diff --git a/core/java/android/hardware/display/BrightnessConfiguration.java b/core/java/android/hardware/display/BrightnessConfiguration.java index 13122d249b231..6412a0ce7219f 100644 --- a/core/java/android/hardware/display/BrightnessConfiguration.java +++ b/core/java/android/hardware/display/BrightnessConfiguration.java @@ -61,7 +61,7 @@ public final class BrightnessConfiguration implements Parcelable { private static final String ATTR_MODEL_LOWER_BOUND = "model-lower-bound"; private static final String ATTR_MODEL_UPPER_BOUND = "model-upper-bound"; /** - * Returned from {@link #getShortTermModelTimeout()} if no timeout has been set. + * Returned from {@link #getShortTermModelTimeoutMillis()} if no timeout has been set. * In this case the device will use the default timeout available in the * {@link BrightnessConfiguration} returned from * {@link DisplayManager#getDefaultBrightnessConfiguration()}. @@ -160,7 +160,7 @@ public final class BrightnessConfiguration implements Parcelable { * {@link #getShortTermModelUpperLuxMultiplier()} to decide whether to keep any adjustment * the user has made to adaptive brightness. */ - public long getShortTermModelTimeout() { + public long getShortTermModelTimeoutMillis() { return mShortTermModelTimeout; } @@ -326,7 +326,7 @@ public final class BrightnessConfiguration implements Parcelable { builder.setDescription(description); final boolean shouldCollectColorSamples = in.readBoolean(); builder.setShouldCollectColorSamples(shouldCollectColorSamples); - builder.setShortTermModelTimeout(in.readLong()); + builder.setShortTermModelTimeoutMillis(in.readLong()); builder.setShortTermModelLowerLuxMultiplier(in.readFloat()); builder.setShortTermModelUpperLuxMultiplier(in.readFloat()); return builder.build(); @@ -487,7 +487,7 @@ public final class BrightnessConfiguration implements Parcelable { builder.addCorrectionByCategory(category, correction); } builder.setShouldCollectColorSamples(shouldCollectColorSamples); - builder.setShortTermModelTimeout(shortTermModelTimeout); + builder.setShortTermModelTimeoutMillis(shortTermModelTimeout); builder.setShortTermModelLowerLuxMultiplier(shortTermModelLowerLuxMultiplier); builder.setShortTermModelUpperLuxMultiplier(shortTermModelUpperLuxMultiplier); return builder.build(); @@ -673,8 +673,8 @@ public final class BrightnessConfiguration implements Parcelable { * adjustment the user has made to adaptive brightness. */ @NonNull - public Builder setShortTermModelTimeout(long shortTermModelTimeout) { - mShortTermModelTimeout = shortTermModelTimeout; + public Builder setShortTermModelTimeoutMillis(long shortTermModelTimeoutMillis) { + mShortTermModelTimeout = shortTermModelTimeoutMillis; return this; } diff --git a/core/tests/coretests/src/android/hardware/display/BrightnessConfigurationTest.java b/core/tests/coretests/src/android/hardware/display/BrightnessConfigurationTest.java index 895b22c7037cd..4370462279b21 100644 --- a/core/tests/coretests/src/android/hardware/display/BrightnessConfigurationTest.java +++ b/core/tests/coretests/src/android/hardware/display/BrightnessConfigurationTest.java @@ -132,7 +132,7 @@ public class BrightnessConfigurationTest { BrightnessConfiguration.Builder builder = new BrightnessConfiguration.Builder(LUX_LEVELS, NITS_LEVELS); builder.setShouldCollectColorSamples(true); - builder.setShortTermModelTimeout(1234L); + builder.setShortTermModelTimeoutMillis(1234L); builder.setShortTermModelLowerLuxMultiplier(0.9f); builder.setShortTermModelUpperLuxMultiplier(0.2f); builder.addCorrectionByCategory(3, @@ -153,7 +153,7 @@ public class BrightnessConfigurationTest { BrightnessConfiguration.Builder builder = new BrightnessConfiguration.Builder(LUX_LEVELS, NITS_LEVELS); builder.setShouldCollectColorSamples(true); - builder.setShortTermModelTimeout(123L); + builder.setShortTermModelTimeoutMillis(123L); builder.setShortTermModelLowerLuxMultiplier(0.4f); builder.setShortTermModelUpperLuxMultiplier(0.8f); builder.addCorrectionByCategory(3, @@ -236,7 +236,7 @@ public class BrightnessConfigurationTest { assertNotEquals(baseConfig, colorCollectionDiffers); builder = new BrightnessConfiguration.Builder(LUX_LEVELS, NITS_LEVELS); - builder.setShortTermModelTimeout(300L); + builder.setShortTermModelTimeoutMillis(300L); BrightnessConfiguration timeoutDiffers = builder.build(); assertNotEquals(baseConfig, timeoutDiffers); diff --git a/services/core/java/com/android/server/display/BrightnessMappingStrategy.java b/services/core/java/com/android/server/display/BrightnessMappingStrategy.java index 28f67fe2d618d..8ed2c331b9b52 100644 --- a/services/core/java/com/android/server/display/BrightnessMappingStrategy.java +++ b/services/core/java/com/android/server/display/BrightnessMappingStrategy.java @@ -87,7 +87,7 @@ public abstract class BrightnessMappingStrategy { } BrightnessConfiguration.Builder builder = new BrightnessConfiguration.Builder( luxLevels, brightnessLevelsNits); - builder.setShortTermModelTimeout(shortTermModelTimeout); + builder.setShortTermModelTimeoutMillis(shortTermModelTimeout); builder.setShortTermModelLowerLuxMultiplier(SHORT_TERM_MODEL_THRESHOLD_RATIO); builder.setShortTermModelUpperLuxMultiplier(SHORT_TERM_MODEL_THRESHOLD_RATIO); return new PhysicalMappingStrategy(builder.build(), nitsRange, backlightRange, @@ -733,10 +733,10 @@ public abstract class BrightnessMappingStrategy { @Override public long getShortTermModelTimeout() { - if (mConfig.getShortTermModelTimeout() >= 0) { - return mConfig.getShortTermModelTimeout(); + if (mConfig.getShortTermModelTimeoutMillis() >= 0) { + return mConfig.getShortTermModelTimeoutMillis(); } else { - return mDefaultConfig.getShortTermModelTimeout(); + return mDefaultConfig.getShortTermModelTimeoutMillis(); } }