commit 012dcb8b1a77b2c716b2053a48a1ca7124a26b5c
author Kriti Dang <kritidang@google.com> Fri Apr 08 12:31:26 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 08 12:31:26 2022 +0000
tree e1f435c19ad440e646476cd4401e1a0dd1a685a0
parent 16b3ddf421f9846d53de4fd84fc1252a7a53e26c
parent 226a5e3b6607a1c7e5f0b6e72ae6b61b8448b885

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

data/etc/displayconfig/default_television.xml

diff --git a/data/etc/displayconfig/default_television.xml b/data/etc/displayconfig/default_television.xml
index 2540f59..0d66110 100644
--- 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>

services/core/java/com/android/server/display/DisplayDeviceConfig.java

diff --git a/services/core/java/com/android/server/display/DisplayDeviceConfig.java b/services/core/java/com/android/server/display/DisplayDeviceConfig.java
index ed05aa6..aa30c08 100644
--- a/services/core/java/com/android/server/display/DisplayDeviceConfig.java
+++ b/services/core/java/com/android/server/display/DisplayDeviceConfig.java
@@ -74,7 +74,7 @@
  *  <pre>
  *  {@code
  *    <displayConfiguration>
- *      <densityMap>
+ *      <densityMapping>
  *        <density>
  *          <height>480</height>
  *          <width>720</width>
@@ -95,7 +95,7 @@
  *          <width>3840</width>
  *          <density>640</density>
  *        </density>
- *      </densityMap>
+ *      </densityMapping>
  *
  *      <screenBrightnessMap>
  *        <point>