diff options
3 files changed, 8 insertions, 8 deletions
diff --git a/services/core/java/com/android/server/display/DisplayDeviceConfig.java b/services/core/java/com/android/server/display/DisplayDeviceConfig.java index 68f45cf656bf..ed05aa67506a 100644 --- a/services/core/java/com/android/server/display/DisplayDeviceConfig.java +++ b/services/core/java/com/android/server/display/DisplayDeviceConfig.java @@ -741,11 +741,11 @@ public class DisplayDeviceConfig { } private void loadDensityMapping(DisplayConfiguration config) { - if (config.getDensityMap() == null) { + if (config.getDensityMapping() == null) { return; } - final List<Density> entriesFromXml = config.getDensityMap().getDensity(); + final List<Density> entriesFromXml = config.getDensityMapping().getDensity(); final DensityMapping.Entry[] entries = new DensityMapping.Entry[entriesFromXml.size()]; 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 5b4febda62ef..0e9a04f1fdde 100644 --- a/services/core/xsd/display-device-config/display-device-config.xsd +++ b/services/core/xsd/display-device-config/display-device-config.xsd @@ -26,7 +26,7 @@ <xs:element name="displayConfiguration"> <xs:complexType> <xs:sequence> - <xs:element type="densityMap" name="densityMap" minOccurs="0" maxOccurs="1"> + <xs:element type="densityMapping" name="densityMapping" minOccurs="0" maxOccurs="1"> <xs:annotation name="nullable"/> <xs:annotation name="final"/> </xs:element> @@ -281,7 +281,7 @@ </xs:sequence> </xs:complexType> - <xs:complexType name="densityMap"> + <xs:complexType name="densityMapping"> <xs:sequence> <xs:element name="density" type="density" maxOccurs="unbounded" minOccurs="1"> </xs:element> diff --git a/services/core/xsd/display-device-config/schema/current.txt b/services/core/xsd/display-device-config/schema/current.txt index ba83c9fbcf91..075edd77af1d 100644 --- a/services/core/xsd/display-device-config/schema/current.txt +++ b/services/core/xsd/display-device-config/schema/current.txt @@ -30,8 +30,8 @@ package com.android.server.display.config { method public final void setWidth(@NonNull java.math.BigInteger); } - public class DensityMap { - ctor public DensityMap(); + public class DensityMapping { + ctor public DensityMapping(); method public java.util.List<com.android.server.display.config.Density> getDensity(); } @@ -40,7 +40,7 @@ package com.android.server.display.config { method @NonNull public final com.android.server.display.config.Thresholds getAmbientBrightnessChangeThresholds(); method public final java.math.BigInteger getAmbientLightHorizonLong(); method public final java.math.BigInteger getAmbientLightHorizonShort(); - method @Nullable public final com.android.server.display.config.DensityMap getDensityMap(); + method @Nullable public final com.android.server.display.config.DensityMapping getDensityMapping(); method @NonNull public final com.android.server.display.config.Thresholds getDisplayBrightnessChangeThresholds(); method public com.android.server.display.config.HighBrightnessMode getHighBrightnessMode(); method public final com.android.server.display.config.SensorDetails getLightSensor(); @@ -56,7 +56,7 @@ package com.android.server.display.config { method public final void setAmbientBrightnessChangeThresholds(@NonNull com.android.server.display.config.Thresholds); method public final void setAmbientLightHorizonLong(java.math.BigInteger); method public final void setAmbientLightHorizonShort(java.math.BigInteger); - method public final void setDensityMap(@Nullable com.android.server.display.config.DensityMap); + method public final void setDensityMapping(@Nullable com.android.server.display.config.DensityMapping); method public final void setDisplayBrightnessChangeThresholds(@NonNull com.android.server.display.config.Thresholds); method public void setHighBrightnessMode(com.android.server.display.config.HighBrightnessMode); method public final void setLightSensor(com.android.server.display.config.SensorDetails); |