| commit | 6d7af5fefa5f5f1b5500a289e9fe476e34b6c218 | [log] [tgz] |
|---|---|---|
| author | Riddle Hsu <riddlehsu@google.com> | Thu Nov 23 11:21:32 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Nov 23 11:21:32 2023 +0000 |
| tree | 236d96870608e7e1473352be906a3349cd4ca3bc | |
| parent | 9faf03b11afe34e984a3e848d5df36c2b761ff1b [diff] | |
| parent | f61f288e1773158487aaba95064c6e55a5bf41d6 [diff] |
Merge "Killing the client process only if the uid matches" into main am: f61f288e17 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2817121 Change-Id: I062c0c251418e8839d3bdf742654a56a4e698eb5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java index d283df2..bb49e0b 100644 --- a/services/core/java/com/android/server/wm/WindowState.java +++ b/services/core/java/com/android/server/wm/WindowState.java
@@ -3292,7 +3292,9 @@ // 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); - android.os.Process.killProcess(mSession.mPid); + if (android.os.Process.getUidForPid(mSession.mPid) == mSession.mUid) { + android.os.Process.killProcess(mSession.mPid); + } } }