Merge "HintManagerService: only check isolated process for app uid" into sc-dev am: 12dd843d73

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

Change-Id: I482225b70d255d2571855a512d013ccf8bccd8a4
This commit is contained in:
Wei Wang
2021-08-09 21:13:18 +00:00
committed by Automerger Merge Worker

View File

@@ -255,7 +255,11 @@ public final class HintManagerService extends SystemService {
private boolean checkTidValid(int uid, int tgid, int [] tids) {
// Make sure all tids belongs to the same UID (including isolated UID),
// tids can belong to different application processes.
List<Integer> eligiblePids = mAmInternal.getIsolatedProcesses(uid);
List<Integer> eligiblePids = null;
// To avoid deadlock, do not call into AMS if the call is from system.
if (uid != Process.SYSTEM_UID) {
eligiblePids = mAmInternal.getIsolatedProcesses(uid);
}
if (eligiblePids == null) {
eligiblePids = new ArrayList<>();
}