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

Commit 33979d57 authored by Louis Chang's avatar Louis Chang Committed by Automerger Merge Worker
Browse files

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

Merge "Adding comments and removes unnecessary parameter" into tm-qpr-dev am: 36f670f6 am: 3f73e57d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19647134



Change-Id: I62168f9719be19e4f5539290c12e976f96443ec5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1dd39efa 3f73e57d

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

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

                wasStopped, this);

        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()) {

            setCurrentLaunchCanTurnScreenOn(true);

        }

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

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


    boolean mCheckedForSetup = false;



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

    private boolean mInExecution = false;



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

    }



    void onExecutionStarted(ActivityStarter starter) {

    void onExecutionStarted() {

        mInExecution = true;

    }

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

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



    private void onExecutionStarted() {

        mController.onExecutionStarted(this);

        mController.onExecutionStarted();

    }



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