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

Merge change 27178 into eclair

Browse Source 
* changes:
  Fix issue #2136448: googleapps crashes while adding 2nd gmail account
This commit is contained in:
Android (Google) Code Review
2009-09-25 20:19:59 -04:00
parent 0c103af370 c1e605eff4
commit 05eeeacee6
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2951,8 +2951,8 @@ public final class ActivityThread {
// The window is now visible if it has been added, we are not // The window is now visible if it has been added, we are not
// simply finishing, and we are not starting another activity. // simply finishing, and we are not starting another activity.
if (!r.activity.mFinished && r.activity.mDecor != null if (!r.activity.mFinished && !a.mStartedActivity
&& !r.hideForNow) { && r.activity.mDecor != null && !r.hideForNow) {
if (r.newConfig != null) { if (r.newConfig != null) {
performConfigurationChanged(r.activity, r.newConfig); performConfigurationChanged(r.activity, r.newConfig);
r.newConfig = null; r.newConfig = null;
@@ -2966,9 +2966,11 @@ public final class ActivityThread {
l.softInputMode = (l.softInputMode l.softInputMode = (l.softInputMode
& (~WindowManager.LayoutParams.SOFT_INPUT_IS_FORWARD_NAVIGATION)) & (~WindowManager.LayoutParams.SOFT_INPUT_IS_FORWARD_NAVIGATION))
| forwardBit; | forwardBit;
ViewManager wm = a.getWindowManager(); if (r.activity.mVisibleFromClient) {
View decor = r.window.getDecorView(); ViewManager wm = a.getWindowManager();
wm.updateViewLayout(decor, l); View decor = r.window.getDecorView();
wm.updateViewLayout(decor, l);
}
} }
r.activity.mVisibleFromServer = true; r.activity.mVisibleFromServer = true;
mNumVisibleActivities++; mNumVisibleActivities++;