diff --git a/services/core/java/com/android/server/display/DisplayDeviceConfig.java b/services/core/java/com/android/server/display/DisplayDeviceConfig.java index 6866137e294ee..064e307274b94 100644 --- a/services/core/java/com/android/server/display/DisplayDeviceConfig.java +++ b/services/core/java/com/android/server/display/DisplayDeviceConfig.java @@ -42,7 +42,6 @@ import com.android.server.display.config.DisplayConfiguration; import com.android.server.display.config.DisplayQuirks; import com.android.server.display.config.HbmTiming; import com.android.server.display.config.HighBrightnessMode; -import com.android.server.display.config.Interpolation; import com.android.server.display.config.NitsMap; import com.android.server.display.config.Point; import com.android.server.display.config.RefreshRateRange; @@ -1254,19 +1253,17 @@ public class DisplayDeviceConfig { } } - private int convertInterpolationType(Interpolation value) { - if (value == null) { + private int convertInterpolationType(String value) { + if (TextUtils.isEmpty(value)) { return INTERPOLATION_DEFAULT; } - switch (value) { - case _default: - return INTERPOLATION_DEFAULT; - case linear: - return INTERPOLATION_LINEAR; - default: - Slog.wtf(TAG, "Unexpected Interpolation Type: " + value); - return INTERPOLATION_DEFAULT; + + if ("linear".equals(value)) { + return INTERPOLATION_LINEAR; } + + Slog.wtf(TAG, "Unexpected Interpolation Type: " + value); + return INTERPOLATION_DEFAULT; } private void loadAmbientHorizonFromDdc(DisplayConfiguration config) { diff --git a/services/core/xsd/display-device-config/display-device-config.xsd b/services/core/xsd/display-device-config/display-device-config.xsd index be0ddc155ae03..5b4febda62efa 100644 --- a/services/core/xsd/display-device-config/display-device-config.xsd +++ b/services/core/xsd/display-device-config/display-device-config.xsd @@ -170,14 +170,6 @@ - - - - - - - - @@ -216,7 +208,8 @@ - + + diff --git a/services/core/xsd/display-device-config/schema/current.txt b/services/core/xsd/display-device-config/schema/current.txt index 2890d686186ed..ba83c9fbcf914 100644 --- a/services/core/xsd/display-device-config/schema/current.txt +++ b/services/core/xsd/display-device-config/schema/current.txt @@ -108,17 +108,11 @@ package com.android.server.display.config { method public final void setTransitionPoint_all(@NonNull java.math.BigDecimal); } - public enum Interpolation { - method public String getRawName(); - enum_constant public static final com.android.server.display.config.Interpolation _default; - enum_constant public static final com.android.server.display.config.Interpolation linear; - } - public class NitsMap { ctor public NitsMap(); - method public com.android.server.display.config.Interpolation getInterpolation(); + method public String getInterpolation(); method @NonNull public final java.util.List getPoint(); - method public void setInterpolation(com.android.server.display.config.Interpolation); + method public void setInterpolation(String); } public class Point {