Merge "check thread group leader before killing process" into main

Chris Li · Gerrit Code Review · commit 23d9f8c24029 · 2024-12-12T02:25:50.000-08:00
diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java
@@ -3254,7 +3254,8 @@ void sendAppVisibilityToClients() {
             // just kill it. And if it is a window of foreground activity, the activity can be
             // restarted automatically if needed.
             Slog.w(TAG, "Exception thrown during dispatchAppVisibility " + this, e);
-            if (android.os.Process.getUidForPid(mSession.mPid) == mSession.mUid) {
+            if (android.os.Process.getUidForPid(mSession.mPid) == mSession.mUid
+                    && android.os.Process.getThreadGroupLeader(mSession.mPid) == mSession.mPid) {
                 android.os.Process.killProcess(mSession.mPid);
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -3254,7 +3254,8 @@ void sendAppVisibilityToClients() {`
`3254`	`3254`	`// just kill it. And if it is a window of foreground activity, the activity can be`
`3255`	`3255`	`// restarted automatically if needed.`
`3256`	`3256`	`Slog.w(TAG, "Exception thrown during dispatchAppVisibility " + this, e);`
`3257`		`- if (android.os.Process.getUidForPid(mSession.mPid) == mSession.mUid) {`
	`3257`	`+ if (android.os.Process.getUidForPid(mSession.mPid) == mSession.mUid`
	`3258`	`+ && android.os.Process.getThreadGroupLeader(mSession.mPid) == mSession.mPid) {`
`3258`	`3259`	`android.os.Process.killProcess(mSession.mPid);`
`3259`	`3260`	`}`
`3260`	`3261`	`}`