From 7002fc431cab5d75a51e3ecc4f2cdb8905402a17 Mon Sep 17 00:00:00 2001 From: Hui Yu Date: Thu, 20 Feb 2020 18:01:47 -0800 Subject: [PATCH] Exempt SHELL_UID for background FGS restriction. Because CtsVerifier starts FGS from adb shell command and access camera. Bug: 149925746, 136219221 Test: CtsVerifier. Change-Id: I79910a3711f506a5011708adc7e615c28328c424 --- services/core/java/com/android/server/am/ActiveServices.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java index 2bcb28de5d9cd..7f98c7f2ba85f 100644 --- a/services/core/java/com/android/server/am/ActiveServices.java +++ b/services/core/java/com/android/server/am/ActiveServices.java @@ -21,6 +21,7 @@ import static android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_LOCATION; import static android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_MANIFEST; import static android.os.Process.NFC_UID; import static android.os.Process.ROOT_UID; +import static android.os.Process.SHELL_UID; import static android.os.Process.SYSTEM_UID; import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_BACKGROUND_CHECK; @@ -4647,6 +4648,7 @@ public final class ActiveServices { case ROOT_UID: case SYSTEM_UID: case NFC_UID: + case SHELL_UID: isCallerSystem = true; break; default: