commit 5ac2da04c1321e8620fc85afae7a168c01ce218b
author Andrii Kulian <akulian@google.com> Tue Apr 19 16:19:04 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 19 16:19:05 2016 +0000
tree 648be1f893c6a39765f81e6592e57ae65517cdcf
parent 30fc04a99cb84058319abdf16b8c5f144c9b1924
parent d0ad938760ef01471ee609d85d025af3b6a37a92

Merge "Recreate activity with correct configuration" into nyc-dev

core/java/android/app/ActivityThread.java

diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index 1d9a582..1da21b0 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -2545,6 +2545,9 @@
                 Context appContext = createBaseContextForActivity(r, activity);
                 CharSequence title = r.activityInfo.loadLabel(appContext.getPackageManager());
                 Configuration config = new Configuration(mCompatConfiguration);
+                if (r.overrideConfig != null) {
+                    config.updateFrom(r.overrideConfig);
+                }
                 if (DEBUG_CONFIGURATION) Slog.v(TAG, "Launching activity "
                         + r.activityInfo.name + " with config " + config);
                 Window window = null;