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

Browse Source 
am: 5ac2da0

* commit '5ac2da04c1321e8620fc85afae7a168c01ce218b':
  Recreate activity with correct configuration

Change-Id: Ice3b3f64ef882ded3583cd7767741696e520c23b
This commit is contained in:
Andrii Kulian
2016-04-19 16:22:03 +00:00
committed by android-build-merger
parent e68cb3c03f 5ac2da04c1
commit 2bf9a05f08
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;