summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Kweku Adams <kwekua@google.com> 2024-02-05 14:18:31 +0000
committer Kweku Adams <kwekua@google.com> 2024-02-05 14:18:31 +0000
commit147134cd4338ec4e2e21600ad7599cf8b8aaf59e (patch)
tree7a1b82f7d2dfc5b9237baea0ab782feccf9c4ed7
parentc80b0a81ff2a8217c089f13b4b6cac49c0659ca2 (diff)
Remove unnecessary flag.
The app compat framework now properly handles the device's version code, so there's no need to have a separate flag to ensure the code only operates on V+ builds. Bug: 300477393 Test: atest CtsJobSchedulerTestCases:JobInfoTest Change-Id: I30404a9e1110f4d5a9b8c5bd1483c81737727962
-rw-r--r--apex/jobscheduler/service/aconfig/job.aconfig7
-rw-r--r--apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java6
-rw-r--r--apex/jobscheduler/service/java/com/android/server/job/JobSchedulerShellCommand.java3
3 files changed, 1 insertions, 15 deletions
diff --git a/apex/jobscheduler/service/aconfig/job.aconfig b/apex/jobscheduler/service/aconfig/job.aconfig
index 8a5206fa3f09..ef9ac73d6f8e 100644
--- a/apex/jobscheduler/service/aconfig/job.aconfig
+++ b/apex/jobscheduler/service/aconfig/job.aconfig
@@ -27,10 +27,3 @@ flag {
description: "Only relax a prefetch job's connectivity constraint when the device is charging and battery is not low"
bug: "299329948"
}
-
-flag {
- name: "throw_on_unsupported_bias_usage"
- namespace: "backstage_power"
- description: "Throw an exception if an unsupported app uses JobInfo.setBias"
- bug: "300477393"
-}
diff --git a/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java b/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java
index cea16d6213af..a23f3129b571 100644
--- a/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java
+++ b/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java
@@ -4715,8 +4715,7 @@ public class JobSchedulerService extends com.android.server.SystemService
private JobInfo enforceBuilderApiPermissions(int uid, int pid, JobInfo job) {
if (job.getBias() != JobInfo.BIAS_DEFAULT
&& !hasPermission(uid, pid, Manifest.permission.UPDATE_DEVICE_STATS)) {
- if (CompatChanges.isChangeEnabled(THROW_ON_UNSUPPORTED_BIAS_USAGE, uid)
- && Flags.throwOnUnsupportedBiasUsage()) {
+ if (CompatChanges.isChangeEnabled(THROW_ON_UNSUPPORTED_BIAS_USAGE, uid)) {
throw new SecurityException("Apps may not call setBias()");
} else {
// We can't throw the exception. Log the issue and modify the job to remove
@@ -5761,9 +5760,6 @@ public class JobSchedulerService extends com.android.server.SystemService
pw.print(Flags.FLAG_DO_NOT_FORCE_RUSH_EXECUTION_AT_BOOT,
Flags.doNotForceRushExecutionAtBoot());
pw.println();
- pw.print(Flags.FLAG_THROW_ON_UNSUPPORTED_BIAS_USAGE,
- Flags.throwOnUnsupportedBiasUsage());
- pw.println();
pw.print(android.app.job.Flags.FLAG_BACKUP_JOBS_EXEMPTION,
android.app.job.Flags.backupJobsExemption());
pw.println();
diff --git a/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerShellCommand.java b/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerShellCommand.java
index 90b4630e9cff..c33db4269616 100644
--- a/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerShellCommand.java
+++ b/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerShellCommand.java
@@ -359,9 +359,6 @@ public final class JobSchedulerShellCommand extends BasicShellCommandHandler {
case com.android.server.job.Flags.FLAG_DO_NOT_FORCE_RUSH_EXECUTION_AT_BOOT:
pw.println(com.android.server.job.Flags.doNotForceRushExecutionAtBoot());
break;
- case com.android.server.job.Flags.FLAG_THROW_ON_UNSUPPORTED_BIAS_USAGE:
- pw.println(com.android.server.job.Flags.throwOnUnsupportedBiasUsage());
- break;
case android.app.job.Flags.FLAG_BACKUP_JOBS_EXEMPTION:
pw.println(android.app.job.Flags.backupJobsExemption());
break;