Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Riddle Hsu
2022-12-16 11:35:00 +00:00
committed by Gerrit Code Review
parent c4e359ecda f38512198a
commit 49ab340c02
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/wm/WindowProcessController.java
View File

@@ -63,6 +63,7 @@ import android.os.LocaleList;
import android.os.Message; import android.os.Message;
import android.os.Process; import android.os.Process;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.UserHandle;
import android.util.ArraySet; import android.util.ArraySet;
import android.util.Log; import android.util.Log;
import android.util.Slog; import android.util.Slog;
@@ -261,7 +262,7 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio
boolean isSysUiPackage = info.packageName.equals( boolean isSysUiPackage = info.packageName.equals(
mAtm.getSysUiServiceComponentLocked().getPackageName()); 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. // 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. // TODO(b/151161907): Remove after support for display-independent (raw) SysUi configs.
mIsActivityConfigOverrideAllowed = false; mIsActivityConfigOverrideAllowed = false;