From d0ad938760ef01471ee609d85d025af3b6a37a92 Mon Sep 17 00:00:00 2001
From: Andrii Kulian <akulian@google.com>
Date: Mon, 18 Apr 2016 20:54:20 -0700
Subject: [PATCH] Recreate activity with correct configuration

Dialer recreates activity inside onConfigurationChange
when configuration changes significantly. Recreated
activity in this case was initialised with old base version
which resulted in incorrect configuration in split-screen.

This CL updates configuration when activity is created from
override config.

Bug: 27976063
Change-Id: I0ac002a5661154ec25f2d5aba3d44070b683ba2f
---
 core/java/android/app/ActivityThread.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index 97bc570aff4cf..f43d456887d62 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -2545,6 +2545,9 @@ public final class ActivityThread {
                 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;