Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bebc8d99 authored by John Reck's avatar John Reck Committed by Android (Google) Code Review
Browse files

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
parent 6ae921ab

core/java/android/app/ForegroundServiceTypePolicy.java

+3 −3
Original line number Diff line number Diff line
@@ -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,