commit 8c0886fe2e7dc97d8c3173053e773afadab1ebf3
author Wale Ogunwale <ogunwale@google.com> Thu Nov 12 16:35:44 2015 +0000
committer android-build-merger <android-build-merger@google.com> Thu Nov 12 16:35:44 2015 +0000
tree 2ebcaada5b27200512a5282182be9ca337b83fa0
parent 7fc97c913487c4df97b8af111390942d61c1d331
parent f98a6f41019bf41d57d0681c2e1d6859f8704091

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

* commit 'f98a6f41019bf41d57d0681c2e1d6859f8704091':
  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 d80c6a3..625ed38 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -1625,7 +1625,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;
                 }