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

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

Merge "System crash during dismissing split in multi-user scenario" am:... 

Merge "System crash during dismissing split in multi-user scenario" am: 49ab340c am: 2d615930 am: d47046d1

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



Change-Id: I4f362019f4b192e38fb1efe1d0e909aa423de277
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5ee35b82 d47046d1

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

+2 −1
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ import android.os.LocaleList; 
import android.os.Message;

import android.os.Process;

import android.os.RemoteException;

import android.os.UserHandle;

import android.util.ArraySet;

import android.util.Log;

import android.util.Slog;
@@ -263,7 +264,7 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio 


        boolean isSysUiPackage = info.packageName.equals(

                mAtm.getSysUiServiceComponentLocked().getPackageName());

        if (isSysUiPackage || mUid == Process.SYSTEM_UID) {

        if (isSysUiPackage || UserHandle.getAppId(mUid) == Process.SYSTEM_UID) {

            // This is a system owned process and should not use an activity config.

            // TODO(b/151161907): Remove after support for display-independent (raw) SysUi configs.

            mIsActivityConfigOverrideAllowed = false;