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

Commit b5c15eab authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

Merge "Account for stopping activities when determining whether to restart"... 

Merge "Account for stopping activities when determining whether to restart" into rvc-dev am: 97b93168

Change-Id: I1fc934d1a6d601d36fed3a6f2e2f3477f1bc5228
parents 7cc2b1f1 97b93168

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

+4 −1
Original line number Diff line number Diff line
@@ -4618,6 +4618,9 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
            } catch (Exception e) {

                Slog.w(TAG, "Exception thrown sending start: " + intent.getComponent(), e);

            }

            // The activity may be waiting for stop, but that is no longer appropriate if we are

            // starting the activity again

            mStackSupervisor.mStoppingActivities.remove(this);

        }

        return false;

    }
@@ -4667,7 +4670,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
     * and {@link #shouldPauseActivity(ActivityRecord)}.

     */

    private boolean shouldStartActivity() {

        return mVisibleRequested && isState(STOPPED);

        return mVisibleRequested && (isState(STOPPED) || isState(STOPPING));

    }



    /**