Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d7af5fe authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Merge "Killing the client process only if the uid matches" into main am: f61f288e 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2817121



Change-Id: I062c0c251418e8839d3bdf742654a56a4e698eb5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9faf03b1 f61f288e

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

+3 −1
Original line number Diff line number Diff line
@@ -3292,9 +3292,11 @@ 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);

            if (android.os.Process.getUidForPid(mSession.mPid) == mSession.mUid) {

                android.os.Process.killProcess(mSession.mPid);

            }

        }

    }



    void onStartFreezingScreen() {

        mAppFreezing = true;