From bebc8d9902083c52d26808cf1f6d38d8218cdbd0 Mon Sep 17 00:00:00 2001 From: John Reck Date: Fri, 3 Feb 2023 13:45:24 +0000 Subject: [PATCH] Revert "Turn on foreground service type policy check." Revert submission 20788708-foregroundServiceTypePolicy Reason for revert: Broke CtsWindowManagerDeviceTestCases which is blocking presubmit for a bunch of targets Reverted changes: /q/submissionid:20788708-foregroundServiceTypePolicy Change-Id: I4aedadb33914c34d7758d20449897b76dd53f8e7 --- 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 d8eb03e960659..20d19c16f8d1f 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 - @EnabledAfter(targetSdkVersion = android.os.Build.VERSION_CODES.TIRAMISU) + @Disabled @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 - @EnabledAfter(targetSdkVersion = android.os.Build.VERSION_CODES.TIRAMISU) + @Disabled @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_GRANTED; + int permissionResult = PERMISSION_DENIED; // Do we have the permission to start FGS with this type. if (policy.mAllOfPermissions != null) { permissionResult = policy.mAllOfPermissions.checkPermissions(context,