Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05eeeace authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 27178 into eclair 

* changes:
  Fix issue #2136448: googleapps crashes while adding 2nd gmail account
parents 0c103af3 c1e605ef

core/java/android/app/ActivityThread.java

+7 −5
Original line number Diff line number Diff line
@@ -2951,8 +2951,8 @@ public final class ActivityThread { 


            // The window is now visible if it has been added, we are not

            // simply finishing, and we are not starting another activity.

            if (!r.activity.mFinished && r.activity.mDecor != null

                    && !r.hideForNow) {

            if (!r.activity.mFinished && !a.mStartedActivity

                    && r.activity.mDecor != null && !r.hideForNow) {

                if (r.newConfig != null) {

                    performConfigurationChanged(r.activity, r.newConfig);

                    r.newConfig = null;
@@ -2966,10 +2966,12 @@ public final class ActivityThread { 
                    l.softInputMode = (l.softInputMode

                            & (~WindowManager.LayoutParams.SOFT_INPUT_IS_FORWARD_NAVIGATION))

                            | forwardBit;

                    if (r.activity.mVisibleFromClient) {

                        ViewManager wm = a.getWindowManager();

                        View decor = r.window.getDecorView();

                        wm.updateViewLayout(decor, l);

                    }

                }

                r.activity.mVisibleFromServer = true;

                mNumVisibleActivities++;

                if (r.activity.mVisibleFromClient) {