From 3f7a6d93c0283bc81782edf185641ea026b521ba Mon Sep 17 00:00:00 2001
From: Hui Yu <huiyu@google.com>
Date: Fri, 28 Feb 2020 17:55:54 -0800
Subject: [PATCH] Remove one foregrond service restriction.

Because it breaks AssistantTest-testSteeringWheelButton test.

Bug: 149835015
Test: com.google.android.projection.gearhead.test.functional#AssistantTest-testSteeringWheelButton
Change-Id: Id6b2c97e14fcdd6f8d970fad3312c4f24e8eb786
---
 .../core/java/com/android/server/am/OomAdjuster.java | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/services/core/java/com/android/server/am/OomAdjuster.java b/services/core/java/com/android/server/am/OomAdjuster.java
index 81fadac1ca029..1bab995bd3809 100644
--- a/services/core/java/com/android/server/am/OomAdjuster.java
+++ b/services/core/java/com/android/server/am/OomAdjuster.java
@@ -1439,7 +1439,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
@@ -1562,10 +1561,6 @@ public final class OomAdjuster {
                             continue;
                         }
 
-                        if (clientProcState == PROCESS_STATE_FOREGROUND_SERVICE) {
-                            procStateFromFGSClient = true;
-                        }
-
                         if (cr.hasFlag(Context.BIND_INCLUDE_CAPABILITIES)) {
                             capability |= client.curCapability;
                         }
@@ -2013,11 +2008,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.