Merge "Changing the name densityMap->densityMapping due to framework changes" into tm-dev

2022-04-08 12:31:26 +00:00
parent 16b3ddf421 226a5e3b66
commit 012dcb8b1a
2 changed files with 4 additions and 4 deletions
--- a/data/etc/displayconfig/default_television.xml
+++ b/data/etc/displayconfig/default_television.xml
@@ -1,5 +1,5 @@
 <displayConfiguration>
-    <densityMap>
+    <densityMapping>
         <density>
            <height>480</height>
            <width>720</width>
@@ -20,5 +20,5 @@
            <width>3840</width>
            <density>640</density>
         </density>
-    </densityMap>
+    </densityMapping>
 </displayConfiguration>
--- a/services/core/java/com/android/server/display/DisplayDeviceConfig.java
+++ b/services/core/java/com/android/server/display/DisplayDeviceConfig.java
@@ -74,7 +74,7 @@ import javax.xml.datatype.DatatypeConfigurationException;
 *  <pre>
 *  {@code
 *    <displayConfiguration>
- *      <densityMap>
+ *      <densityMapping>
 *        <density>
 *          <height>480</height>
 *          <width>720</width>
@@ -95,7 +95,7 @@ import javax.xml.datatype.DatatypeConfigurationException;
 *          <width>3840</width>
 *          <density>640</density>
 *        </density>
- *      </densityMap>
+ *      </densityMapping>
 *
 *      <screenBrightnessMap>
 *        <point>