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

Merge "Call ActivityManager to request activity relaunch" into oc-dev

Browse Source 
am: 748405a0f5

Change-Id: I2780805663b223d82b1b7d3582ae5850c30c7b7d
This commit is contained in:
Fyodor Kupolov
2017-05-06 02:06:04 +00:00
committed by android-build-merger
parent ada0568c76 748405a0f5
commit f9c94ddef7
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4275,9 +4275,19 @@ public final class ActivityThread {
View.mDebugViewAttributes = debugViewAttributes;
// request all activities to relaunch for the changes to take place
for (Map.Entry<IBinder, ActivityClientRecord> entry : mActivities.entrySet()) {
requestRelaunchActivity(entry.getKey(), null, null, 0, false, null, null, false,
false /* preserveWindow */);
requestRelaunchAllActivities();
}
}
private void requestRelaunchAllActivities() {
for (Map.Entry<IBinder, ActivityClientRecord> entry : mActivities.entrySet()) {
final Activity activity = entry.getValue().activity;
if (!activity.mFinished) {
try {
ActivityManager.getService().requestActivityRelaunch(entry.getKey());
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
}
}
}
@@ -5116,14 +5126,7 @@ public final class ActivityThread {
newConfig.assetsSeq = (mConfiguration != null ? mConfiguration.assetsSeq : 0) + 1;
handleConfigurationChanged(newConfig, null);
// Schedule all activities to reload
for (final Map.Entry<IBinder, ActivityClientRecord> entry : mActivities.entrySet()) {
final Activity activity = entry.getValue().activity;
if (!activity.mFinished) {
requestRelaunchActivity(entry.getKey(), null, null, 0, false, null, null, false,
false);
}
}
requestRelaunchAllActivities();
}
static void freeTextLayoutCachesIfNeeded(int configDiff) {