Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "presubmit-am-ac759ede893c416ea62c4d5bc087973f" into tm-mainline-prod am: 55fbc1411c

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

Change-Id: I08bcc89ca77a551b77cefde9783edd6211c83f72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Kriti Dang
2022-04-08 12:45:02 +00:00
committed by Automerger Merge Worker
parent ce1b456f5b 55fbc1411c
commit 47984e0783
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/etc/displayconfig/default_television.xml
View File

@@ -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>

4
services/core/java/com/android/server/display/DisplayDeviceConfig.java
View File

@@ -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>