Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Turn on foreground service type policy check."

Browse Source
This commit is contained in:
Hui Yu
2023-02-02 16:04:07 +00:00
committed by Android (Google) Code Review
parent bef72a409e 6ae921ab69
commit b0199cdbbb
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/app/ForegroundServiceTypePolicy.java
View File

@@ -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,