commit f98a6f41019bf41d57d0681c2e1d6859f8704091
author Wale Ogunwale <ogunwale@google.com> Thu Nov 12 16:08:34 2015 +0000
committer android-build-merger <android-build-merger@google.com> Thu Nov 12 16:08:34 2015 +0000
tree 73288a461295fcae7f2ff1856bdc43a2c4a4942e
parent 184cefc2ae33dde0d82a2ee4ed2683b05df9ccc3
parent 0170fb8281d4de9364dc51985be26adea3163c0d

Merge "Avoid configuration of callback being reset after relayout." am: cbcafde45e
am: 0170fb8281

* commit '0170fb8281d4de9364dc51985be26adea3163c0d':
  Avoid configuration of callback being reset after relayout.

core/java/android/view/ViewRootImpl.java

diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index 42402eb..1d1edaa 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -1591,7 +1591,7 @@
                 if (mPendingConfiguration.seq != 0) {
                     if (DEBUG_CONFIGURATION) Log.v(TAG, "Visible with new config: "
                             + mPendingConfiguration);
-                    updateConfiguration(mPendingConfiguration, !mFirst);
+                    updateConfiguration(new Configuration(mPendingConfiguration), !mFirst);
                     mPendingConfiguration.seq = 0;
                 }