diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 9b64fc45487..4230b6a37a7 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -4697,14 +4697,6 @@ - - - - - - - diff --git a/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java b/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java index b1018ba34cd..a80987ddb17 100644 --- a/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java +++ b/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java @@ -49,6 +49,7 @@ import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import com.android.settingslib.fuelgauge.PowerAllowlistBackend; import com.android.settingslib.utils.ThreadUtils; +import java.time.Duration; import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; @@ -59,7 +60,7 @@ public class AnomalyDetectionJobService extends JobService { private static final int ON = 1; @VisibleForTesting static final int UID_NULL = -1; @VisibleForTesting static final int STATSD_UID_FILED = 1; - @VisibleForTesting static final long MAX_DELAY_MS = TimeUnit.MINUTES.toMillis(30); + @VisibleForTesting static final long MAX_DELAY_MS = Duration.ofDays(1).toMillis(); private final Object mLock = new Object(); diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java index a67e5d37e19..482f0d0ce02 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java @@ -71,6 +71,7 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.android.controller.ServiceController; import org.robolectric.annotation.Config; +import java.time.Duration; import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; @@ -133,7 +134,7 @@ public class AnomalyDetectionJobServiceTest { JobInfo pendingJob = pendingJobs.get(0); assertThat(pendingJob.getId()).isEqualTo(R.integer.job_anomaly_detection); assertThat(pendingJob.getMaxExecutionDelayMillis()) - .isEqualTo(TimeUnit.MINUTES.toMillis(30)); + .isEqualTo(Duration.ofDays(1).toMillis()); } @Test