Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3992d636 authored by Kriti Dang's avatar Kriti Dang Committed by Presubmit Automerger Backend
Browse files

[automerge] Changing the name densityMap->densityMapping due to framework changes 2p: 226a5e3b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17617007

Bug: 228268712
Change-Id: Ibf6fa69f6e64e33d705226685529229d42515599
parents 46b1ac3c 226a5e3b

data/etc/displayconfig/default_television.xml

+2 −2
Original line number Diff line number Diff line 
<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

+2 −2
Original line number Diff line number Diff line
@@ -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>