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

Commit 36f670f6 authored by Louis Chang's avatar Louis Chang Committed by Android (Google) Code Review
Browse files

Merge "Adding comments and removes unnecessary parameter" into tm-qpr-dev

parents 13255a0a 25bcc875

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -5649,7 +5649,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        ProtoLog.v(WM_DEBUG_ADD_REMOVE, "notifyAppResumed: wasStopped=%b %s",

        ProtoLog.v(WM_DEBUG_ADD_REMOVE, "notifyAppResumed: wasStopped=%b %s",

                wasStopped, this);

                wasStopped, this);

        mAppStopped = false;

        mAppStopped = false;

        // Allow the window to turn the screen on once the app is resumed again.

        // Allow the window to turn the screen on once the app is started and resumed.

        if (mAtmService.getActivityStartController().isInExecution()) {

        if (mAtmService.getActivityStartController().isInExecution()) {

            setCurrentLaunchCanTurnScreenOn(true);

            setCurrentLaunchCanTurnScreenOn(true);

        }

        }

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -94,6 +94,7 @@ public class ActivityStartController { 




    boolean mCheckedForSetup = false;

    boolean mCheckedForSetup = false;





    /** Whether an {@link ActivityStarter} is currently executing (starting an Activity). */

    private boolean mInExecution = false;

    private boolean mInExecution = false;





    /**

    /**
@@ -129,7 +130,7 @@ public class ActivityStartController { 
        return mFactory.obtain().setIntent(intent).setReason(reason);

        return mFactory.obtain().setIntent(intent).setReason(reason);

    }

    }





    void onExecutionStarted(ActivityStarter starter) {

    void onExecutionStarted() {

        mInExecution = true;

        mInExecution = true;

    }

    }

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -1268,7 +1268,7 @@ class ActivityStarter { 
    }

    }





    private void onExecutionStarted() {

    private void onExecutionStarted() {

        mController.onExecutionStarted(this);

        mController.onExecutionStarted();

    }

    }





    private boolean isHomeApp(int uid, @Nullable String packageName) {

    private boolean isHomeApp(int uid, @Nullable String packageName) {