commit 6486324d24d47a1a8d18a0314722f466a5ace48b
author Alan Viverette <alanv@google.com> Fri Feb 05 15:30:28 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 05 15:30:28 2016 +0000
tree 36bfc3dcc3c21fd04a40ee5a72c0e3c63bd68c82
parent 1819bb5230241b3428b75f848c3f9977afd0186f
parent 2ac46f1bda969b2d042ac35ba89cda3e595d1c4a

Merge "Ensure Bitmap.getDefaultDensity() matches DENSITY_DEVICE"

core/java/android/app/ActivityThread.java

diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index 805b203..6424520 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -4822,14 +4822,12 @@
     }
 
     private void updateDefaultDensity() {
-        if (mCurDefaultDisplayDpi != Configuration.DENSITY_DPI_UNDEFINED
-                && mCurDefaultDisplayDpi != DisplayMetrics.DENSITY_DEVICE
-                && !mDensityCompatMode) {
-            Slog.i(TAG, "Switching default density from "
-                    + DisplayMetrics.DENSITY_DEVICE + " to "
-                    + mCurDefaultDisplayDpi);
-            DisplayMetrics.DENSITY_DEVICE = mCurDefaultDisplayDpi;
-            Bitmap.setDefaultDensity(DisplayMetrics.DENSITY_DEFAULT);
+        final int densityDpi = mCurDefaultDisplayDpi;
+        if (!mDensityCompatMode
+                && densityDpi != Configuration.DENSITY_DPI_UNDEFINED
+                && densityDpi != DisplayMetrics.DENSITY_DEVICE) {
+            DisplayMetrics.DENSITY_DEVICE = densityDpi;
+            Bitmap.setDefaultDensity(densityDpi);
         }
     }