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

Merge "Change "checkTidValid" to only call into AM if necessary" into udc-dev

Browse Source
This commit is contained in:
Matt Buckley
2023-04-03 19:33:20 +00:00
committed by Android (Google) Code Review
parent d1306c3953 77d75bf13e
commit f735be31d5
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
services/core/java/com/android/server/power/hint/HintManagerService.java
View File

@@ -48,7 +48,6 @@ import com.android.server.utils.Slogf;
import java.io.FileDescriptor; import java.io.FileDescriptor;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
@@ -324,16 +323,7 @@ public final class HintManagerService extends SystemService {
private boolean checkTidValid(int uid, int tgid, int [] tids) { private boolean checkTidValid(int uid, int tgid, int [] tids) {
// Make sure all tids belongs to the same UID (including isolated UID), // Make sure all tids belongs to the same UID (including isolated UID),
// tids can belong to different application processes. // tids can belong to different application processes.
List<Integer> eligiblePids = null; List<Integer> isolatedPids = 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<>();
}
eligiblePids.add(tgid);
for (int threadId : tids) { for (int threadId : tids) {
final String[] procStatusKeys = new String[] { final String[] procStatusKeys = new String[] {
"Uid:", "Uid:",
@@ -345,7 +335,21 @@ public final class HintManagerService extends SystemService {
int pidOfThreadId = (int) output[1]; int pidOfThreadId = (int) output[1];
// use PID check for isolated processes, use UID check for non-isolated processes. // use PID check for isolated processes, use UID check for non-isolated processes.
if (eligiblePids.contains(pidOfThreadId) || uidOfThreadId == uid) { if (pidOfThreadId == tgid || uidOfThreadId == uid) {
continue;
}
// Only call into AM if the tid is either isolated or invalid
if (isolatedPids == null) {
// To avoid deadlock, do not call into AMS if the call is from system.
if (uid == Process.SYSTEM_UID) {
return false;
}
isolatedPids = mAmInternal.getIsolatedProcesses(uid);
if (isolatedPids == null) {
return false;
}
}
if (isolatedPids.contains(pidOfThreadId)) {
continue; continue;
} }
return false; return false;