diff options
author | Roman Birg <roman@cyngn.com> | 2015-05-18 16:17:17 -0700 |
---|---|---|
committer | Roman Birg <roman@cyngn.com> | 2015-05-20 18:07:59 +0000 |
commit | b729be194d50c0eb6ba77eb091c1d672b188cdfb (patch) | |
tree | 92d5c2ad26850dbcf227117f2c5f3f175ab4e3ac | |
parent | d442afea6e72a4c6a9c4c5a307256ad93caae9dc (diff) | |
download | android_frameworks_base-stable/cm-12.1-YOG3C.tar.gz android_frameworks_base-stable/cm-12.1-YOG3C.tar.bz2 android_frameworks_base-stable/cm-12.1-YOG3C.zip |
fix CTS DisplayTest.testGetMetrics()stable/cm-12.1-YOG3C
The test asserts the second display's DPI settings are what they should
be that it creates. However, DisplayInfo.getMetricsWithSize() method was
calling updateDensity() which actually resets internal members to the
primary screen's current setup (which is persisted via a build.prop
setting).
Change-Id: I589d56e98fd76f091e3105df099e5d7efd8b853e
Signed-off-by: Roman Birg <roman@cyngn.com>
-rw-r--r-- | core/java/android/view/DisplayInfo.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/core/java/android/view/DisplayInfo.java b/core/java/android/view/DisplayInfo.java index 89c6c37cf66..9feb681a685 100644 --- a/core/java/android/view/DisplayInfo.java +++ b/core/java/android/view/DisplayInfo.java @@ -441,7 +441,6 @@ public final class DisplayInfo implements Parcelable { outMetrics.scaledDensity = outMetrics.noncompatScaledDensity = outMetrics.density; outMetrics.xdpi = outMetrics.noncompatXdpi = physicalXDpi; outMetrics.ydpi = outMetrics.noncompatYdpi = physicalYDpi; - outMetrics.updateDensity(); if (!compatInfo.equals(CompatibilityInfo.DEFAULT_COMPATIBILITY_INFO)) { compatInfo.applyToDisplayMetrics(outMetrics); |