Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Recreate activity with correct configuration" into nyc-dev am: 5ac2da0

Browse Source 
am: 2bf9a05

* commit '2bf9a05f08f7e7bfc3f57041a9cfe3b591da4e03':
  Recreate activity with correct configuration

Change-Id: I9c5e383cbeb37c7a3321b1c441c72ef8d305b453
This commit is contained in:
Andrii Kulian
2016-04-19 16:28:32 +00:00
committed by android-build-merger
parent 7eb2210c0f 2bf9a05f08
commit cdc760ca3c
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/app/ActivityThread.java
View File

@@ -2545,6 +2545,9 @@ public final class ActivityThread {
Context appContext = createBaseContextForActivity(r, activity); Context appContext = createBaseContextForActivity(r, activity);
CharSequence title = r.activityInfo.loadLabel(appContext.getPackageManager()); CharSequence title = r.activityInfo.loadLabel(appContext.getPackageManager());
Configuration config = new Configuration(mCompatConfiguration); Configuration config = new Configuration(mCompatConfiguration);
if (r.overrideConfig != null) {
config.updateFrom(r.overrideConfig);
}
if (DEBUG_CONFIGURATION) Slog.v(TAG, "Launching activity " if (DEBUG_CONFIGURATION) Slog.v(TAG, "Launching activity "
+ r.activityInfo.name + " with config " + config); + r.activityInfo.name + " with config " + config);
Window window = null; Window window = null;