Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I58e707ca0513d7333d3b7f69b232767919b52253
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Louis Chang
2022-08-17 05:20:49 +00:00
committed by Automerger Merge Worker
parent a71995dd93 36f670f63f
commit 3f73e57d6a
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/ActivityRecord.java
View File

@@ -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);
} }

3
services/core/java/com/android/server/wm/ActivityStartController.java
View File

@@ -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;
} }

2
services/core/java/com/android/server/wm/ActivityStarter.java
View File

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