commit 0acf75e1df2446218219b4f2822c60b9c9d1c572
author Riddle Hsu <riddlehsu@google.com> Thu Mar 07 07:19:21 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 07 07:19:21 2024 +0000
tree 29ed62d506e227fdea6b54b78c0c8daf91a4705f
parent 40ae2b005bde074bf1dbc1b2c65c5b31571f441f
parent 5158edafe9a7e01d2d1587b4bf3dc2b8ba2a7dec

Merge "Reset logging name of Task at the end of setIntent" into main

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

diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java
index e16d869..573cdf5 100644
--- a/services/core/java/com/android/server/wm/Task.java
+++ b/services/core/java/com/android/server/wm/Task.java
@@ -978,7 +978,6 @@
         }
         effectiveUid = info.applicationInfo.uid;
         mIsEffectivelySystemApp = info.applicationInfo.isSystemApp();
-        stringName = null;
 
         if (info.targetActivity == null) {
             if (_intent != null) {
@@ -1045,6 +1044,7 @@
             updateTaskDescription();
         }
         mSupportsPictureInPicture = info.supportsPictureInPicture();
+        stringName = null;
 
         // Re-adding the task to Recents once updated
         if (inRecents) {