summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2025-01-14 00:01:02 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 2025-01-14 00:01:02 -0800
commit6d2d5f80674a41f45b67a536d32d3444bf0e67eb (patch)
tree05c8a3654f4de6926a114caebebca1132e97d064
parent05f838e9cfd10937a24b97e79ae4ba753ec4ab88 (diff)
parentd23d7cc9609aeea3c4cf383531c546d002e3ed09 (diff)
Merge "Add LaunchSourceType annotation in ActivityRecord." into main
-rw-r--r--services/core/java/com/android/server/wm/ActivityRecord.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java
index dca65a183f18..569213b45c17 100644
--- a/services/core/java/com/android/server/wm/ActivityRecord.java
+++ b/services/core/java/com/android/server/wm/ActivityRecord.java
@@ -482,6 +482,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
final String launchedFromPackage; // always the package who started the activity.
@Nullable
final String launchedFromFeatureId; // always the feature in launchedFromPackage
+ @LaunchSourceType
int mLaunchSourceType; // latest launch source type
final Intent intent; // the original intent that generated us
final String shortComponentName; // the short component name of the intent
@@ -2330,6 +2331,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
mLaunchSourceType = determineLaunchSourceType(launchFromUid, caller);
}
+ @LaunchSourceType
private int determineLaunchSourceType(int launchFromUid, WindowProcessController caller) {
if (launchFromUid == Process.SYSTEM_UID || launchFromUid == Process.ROOT_UID) {
return LAUNCH_SOURCE_TYPE_SYSTEM;