diff options
| author | 2023-11-23 12:14:19 +0000 | |
|---|---|---|
| committer | 2023-11-23 12:14:19 +0000 | |
| commit | dfb4dc4e2703275ced3fb622217f3399344995b3 (patch) | |
| tree | d2a9945e644359e4c189b04775bd14376439a2a9 | |
| parent | 34c1540b6b570c46ca06dd7b9224e0a38ee301c9 (diff) | |
| parent | 0fa9f4878484d5b1e30384a06d39ea3668f906a3 (diff) | |
Merge "Killing the client process only if the uid matches" into main am: f61f288e17 am: 2acf9ad091 am: 0fa9f48784
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2817121
Change-Id: I0e7c72d038c06d4c2454ce525eb8e6c992a4fc6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowState.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java index 3e43908994ad..6d6bcc88e8aa 100644 --- a/services/core/java/com/android/server/wm/WindowState.java +++ b/services/core/java/com/android/server/wm/WindowState.java @@ -3276,7 +3276,9 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP // 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); + } } } |