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

Commit 1eff2480 authored by Louis Chang's avatar Louis Chang
Browse files

Fix unable finish booting when display added before boot 

We started home activity before system ready because overlay
display was added. It accidentally updated the AM state to booted
without actually finishing booting procedure. The booting procedure
was unable to complete afterward.

Do not start home activity before system booting.

Bug: 118796241
Test: atest ActivityStackSupervisorTests

Change-Id: I4e4a38b742529fc7ba6163c1a05137c68faf83e7
parent 44f74d11

services/core/java/com/android/server/wm/ActivityStackSupervisor.java

+16 −10
Original line number Diff line number Diff line
@@ -59,6 +59,13 @@ import static android.view.Display.INVALID_DISPLAY; 
import static android.view.Display.TYPE_VIRTUAL;

import static android.view.WindowManager.TRANSIT_DOCK_TASK_FROM_RECENTS;



import static com.android.server.am.ActivityStackSupervisorProto.CONFIGURATION_CONTAINER;

import static com.android.server.am.ActivityStackSupervisorProto.DISPLAYS;

import static com.android.server.am.ActivityStackSupervisorProto.FOCUSED_STACK_ID;

import static com.android.server.am.ActivityStackSupervisorProto.IS_HOME_RECENTS_COMPONENT;

import static com.android.server.am.ActivityStackSupervisorProto.KEYGUARD_CONTROLLER;

import static com.android.server.am.ActivityStackSupervisorProto.PENDING_ACTIVITIES;

import static com.android.server.am.ActivityStackSupervisorProto.RESUMED_ACTIVITY;

import static com.android.server.wm.ActivityStack.ActivityState.DESTROYED;

import static com.android.server.wm.ActivityStack.ActivityState.INITIALIZING;

import static com.android.server.wm.ActivityStack.ActivityState.PAUSED;
@@ -67,13 +74,6 @@ import static com.android.server.wm.ActivityStack.ActivityState.RESUMED; 
import static com.android.server.wm.ActivityStack.ActivityState.STOPPED;

import static com.android.server.wm.ActivityStack.ActivityState.STOPPING;

import static com.android.server.wm.ActivityStack.REMOVE_TASK_MODE_MOVING;

import static com.android.server.am.ActivityStackSupervisorProto.CONFIGURATION_CONTAINER;

import static com.android.server.am.ActivityStackSupervisorProto.DISPLAYS;

import static com.android.server.am.ActivityStackSupervisorProto.FOCUSED_STACK_ID;

import static com.android.server.am.ActivityStackSupervisorProto.IS_HOME_RECENTS_COMPONENT;

import static com.android.server.am.ActivityStackSupervisorProto.KEYGUARD_CONTROLLER;

import static com.android.server.am.ActivityStackSupervisorProto.PENDING_ACTIVITIES;

import static com.android.server.am.ActivityStackSupervisorProto.RESUMED_ACTIVITY;

import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_ALL;

import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_IDLE;

import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_PAUSE;
@@ -1976,8 +1976,9 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D 


            //Slog.i(TAG, "IDLE: mBooted=" + mBooted + ", fromTimeout=" + fromTimeout);



            // Make sure we can finish booting when all resumed activities are idle.

            if ((!mService.isBooted() && allResumedActivitiesIdle()) || fromTimeout) {

            // Check if able to finish booting when device is booting and all resumed activities

            // are idle.

            if ((mService.isBooting() && allResumedActivitiesIdle()) || fromTimeout) {

                booting = checkFinishBootingLocked();

            }
@@ -4136,9 +4137,14 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D 
        if (DEBUG_STACK) Slog.v(TAG, "Display added displayId=" + displayId);

        synchronized (mService.mGlobalLock) {

            getActivityDisplayOrCreateLocked(displayId);

            // Do not start home before booting, or it may accidentally finish booting before it

            // starts. Instead, we expect home activities to be launched when the system is ready

            // (ActivityManagerService#systemReady).

            if (mService.isBooted() || mService.isBooting()) {

                startHomeOnDisplay(mCurrentUser, "displayAdded", displayId);

            }

        }

    }



    @Override

    public void onDisplayRemoved(int displayId) {

services/tests/wmtests/src/com/android/server/wm/ActivityStackSupervisorTests.java

+19 −0
Original line number Diff line number Diff line
@@ -458,4 +458,23 @@ public class ActivityStackSupervisorTests extends ActivityTestsBase { 
        assertNotNull(secondDisplay.getTopStack());

        assertTrue(secondDisplay.getTopStack().isActivityTypeHome());

    }



    /**

     * Tests that home activities won't be started before booting when display added.

     */

    @Test

    public void testNotStartHomeBeforeBoot() throws Exception {

        final int displayId = 1;

        final boolean isBooting = mService.mAmInternal.isBooting();

        final boolean isBooted = mService.mAmInternal.isBooted();

        try {

            mService.mAmInternal.setBooting(false);

            mService.mAmInternal.setBooted(false);

            mSupervisor.onDisplayAdded(displayId);

            verify(mSupervisor, never()).startHomeOnDisplay(anyInt(), any(), anyInt());

        } finally {

            mService.mAmInternal.setBooting(isBooting);

            mService.mAmInternal.setBooted(isBooted);

        }

    }

}