From 6ae921ab69ce183af9db7b669fba90f664ad2754 Mon Sep 17 00:00:00 2001 From: Hui Yu Date: Wed, 1 Feb 2023 19:36:48 +0000 Subject: [PATCH] Turn on foreground service type policy check. Bug: b/254661666 Test: atest cts/tests/app/FgsTest/src/android/app/cts/fgstest/ActivityManagerForegroundServiceTypeTest.java atest cts/tests/app/src/android/app/cts/ActivityManagerFgsBgStartTest.java atest cts/tests/app/src/android/app/cts/ActivityManagerProcessStateTest.java atest cts/tests/app/src/android/app/cts/NotificationManagerBubbleTest.java Change-Id: I8e434f123a67aea1451fbb627de76135ec42bd7d --- core/java/android/app/ForegroundServiceTypePolicy.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/java/android/app/ForegroundServiceTypePolicy.java b/core/java/android/app/ForegroundServiceTypePolicy.java index 20d19c16f8d1f..d8eb03e960659 100644 --- a/core/java/android/app/ForegroundServiceTypePolicy.java +++ b/core/java/android/app/ForegroundServiceTypePolicy.java @@ -109,7 +109,7 @@ public abstract class ForegroundServiceTypePolicy { */ // TODO (b/254661666): Change to @EnabledAfter(T) @ChangeId - @Disabled + @EnabledAfter(targetSdkVersion = android.os.Build.VERSION_CODES.TIRAMISU) @Overridable public static final long FGS_TYPE_NONE_DISABLED_CHANGE_ID = 255038118L; @@ -144,7 +144,7 @@ public abstract class ForegroundServiceTypePolicy { */ // TODO (b/254661666): Change to @EnabledAfter(T) @ChangeId - @Disabled + @EnabledAfter(targetSdkVersion = android.os.Build.VERSION_CODES.TIRAMISU) @Overridable public static final long FGS_TYPE_PERMISSION_CHANGE_ID = 254662522L; @@ -1059,7 +1059,7 @@ public abstract class ForegroundServiceTypePolicy { if (policy.isTypeDisabled(callerUid)) { return FGS_TYPE_POLICY_CHECK_DISABLED; } - int permissionResult = PERMISSION_DENIED; + int permissionResult = PERMISSION_GRANTED; // Do we have the permission to start FGS with this type. if (policy.mAllOfPermissions != null) { permissionResult = policy.mAllOfPermissions.checkPermissions(context,