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

Remove one foregrond service restriction.

Browse Source 
Because it breaks AssistantTest-testSteeringWheelButton test.

Bug: 149835015
Test: com.google.android.projection.gearhead.test.functional#AssistantTest-testSteeringWheelButton
Change-Id: Id6b2c97e14fcdd6f8d970fad3312c4f24e8eb786
(cherry picked from commit 3f7a6d93c0)
This commit is contained in:
Hui Yu
2020-02-28 17:55:54 -08:00
parent 9e265c0d94
commit ee15be05dc
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/am/OomAdjuster.java
View File

@@ -1438,7 +1438,6 @@ public final class OomAdjuster {
}
int capabilityFromFGS = 0; // capability from foreground service.
boolean procStateFromFGSClient = false;
for (int is = app.services.size() - 1;
is >= 0 && (adj > ProcessList.FOREGROUND_APP_ADJ
|| schedGroup == ProcessList.SCHED_GROUP_BACKGROUND
@@ -1561,10 +1560,6 @@ public final class OomAdjuster {
continue;
}
if (clientProcState == PROCESS_STATE_FOREGROUND_SERVICE) {
procStateFromFGSClient = true;
}
if (cr.hasFlag(Context.BIND_INCLUDE_CAPABILITIES)) {
capability |= client.curCapability;
}
@@ -2012,11 +2007,8 @@ public final class OomAdjuster {
} else if (!ActivityManager.isProcStateBackground(procState)) {
// procState higher than PROCESS_STATE_BOUND_FOREGROUND_SERVICE implicitly has
// camera/microphone capability
if (procState == PROCESS_STATE_FOREGROUND_SERVICE && procStateFromFGSClient) {
// if the FGS state is passed down from client, do not grant implicit capabilities.
} else {
capability |= PROCESS_CAPABILITY_ALL_IMPLICIT;
}
//TODO: remove this line when enforcing the feature.
capability |= PROCESS_CAPABILITY_ALL_IMPLICIT;
}
// TOP process has all capabilities.