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

Commit 0fa9f487 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 am: 2acf9ad0 

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



Change-Id: I65e127edc222b42bc25a2769fd89eaae81d3eac8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 79ec4a40 2acf9ad0

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;