diff options
3 files changed, 4 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index 3a2c9c831cb3..208450d6b309 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -5649,7 +5649,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); } diff --git a/services/core/java/com/android/server/wm/ActivityStartController.java b/services/core/java/com/android/server/wm/ActivityStartController.java index 9be93404dcf1..7c25b53dc420 100644 --- a/services/core/java/com/android/server/wm/ActivityStartController.java +++ b/services/core/java/com/android/server/wm/ActivityStartController.java @@ -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; } diff --git a/services/core/java/com/android/server/wm/ActivityStarter.java b/services/core/java/com/android/server/wm/ActivityStarter.java index 99b34c78597c..4c580df6e330 100644 --- a/services/core/java/com/android/server/wm/ActivityStarter.java +++ b/services/core/java/com/android/server/wm/ActivityStarter.java @@ -1268,7 +1268,7 @@ class ActivityStarter { } private void onExecutionStarted() { - mController.onExecutionStarted(this); + mController.onExecutionStarted(); } private boolean isHomeApp(int uid, @Nullable String packageName) { |