commit f9b41efe17718a21df115d95c47a94d97a767076
author Dianne Hackborn <hackbod@android.com> Sun May 26 06:57:04 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sun May 26 06:57:05 2013 +0000
tree cd765fd01f15a1484f2c2173894c799a2b31b536
parent fee6d0cb1e27b13f6ed91c1cdcb9d524bb967ea2
parent e7123a660182c6a5869f46579e596e2b90983a6b

Merge "Don't include flags in configuration change if their value hasn't changed."

core/java/android/content/res/Configuration.java

diff --git a/core/java/android/content/res/Configuration.java b/core/java/android/content/res/Configuration.java
index 86d6ee7..add8399 100644
--- a/core/java/android/content/res/Configuration.java
+++ b/core/java/android/content/res/Configuration.java
@@ -853,11 +853,13 @@
             changed |= ActivityInfo.CONFIG_SCREEN_SIZE;
             screenHeightDp = delta.screenHeightDp;
         }
-        if (delta.smallestScreenWidthDp != SMALLEST_SCREEN_WIDTH_DP_UNDEFINED) {
-            changed |= ActivityInfo.CONFIG_SCREEN_SIZE;
+        if (delta.smallestScreenWidthDp != SMALLEST_SCREEN_WIDTH_DP_UNDEFINED
+                && smallestScreenWidthDp != delta.smallestScreenWidthDp) {
+            changed |= ActivityInfo.CONFIG_SMALLEST_SCREEN_SIZE;
             smallestScreenWidthDp = delta.smallestScreenWidthDp;
         }
-        if (delta.densityDpi != DENSITY_DPI_UNDEFINED) {
+        if (delta.densityDpi != DENSITY_DPI_UNDEFINED &&
+                densityDpi != delta.densityDpi) {
             changed |= ActivityInfo.CONFIG_DENSITY;
             densityDpi = delta.densityDpi;
         }