From d81a6ceefd86938393f4e4b4d51db70b85ec2142 Mon Sep 17 00:00:00 2001 From: Kuan Wang Date: Mon, 7 Nov 2022 13:49:48 +0800 Subject: [PATCH] Remove unnecessary check canScheduleExactAlarms() as Settings always has the permission. Test: make RunSettingsRoboTests Bug: 256123455 Change-Id: I5089494164581465da9533671fc414c7bee1196f --- .../fuelgauge/batteryusage/PeriodicJobManager.java | 13 ------------- .../batteryusage/BootBroadcastReceiverTest.java | 1 - .../batteryusage/PeriodicJobManagerTest.java | 10 ---------- .../batteryusage/PeriodicJobReceiverTest.java | 1 - 4 files changed, 25 deletions(-) diff --git a/src/com/android/settings/fuelgauge/batteryusage/PeriodicJobManager.java b/src/com/android/settings/fuelgauge/batteryusage/PeriodicJobManager.java index 140ba5ff4f2..39293dcc466 100644 --- a/src/com/android/settings/fuelgauge/batteryusage/PeriodicJobManager.java +++ b/src/com/android/settings/fuelgauge/batteryusage/PeriodicJobManager.java @@ -73,10 +73,6 @@ public final class PeriodicJobManager { // Cancels the previous alert job and schedules the next one. final PendingIntent pendingIntent = getPendingIntent(); cancelJob(pendingIntent); - if (!canScheduleExactAlarms()) { - Log.w(TAG, "cannot schedule exact alarm job"); - return; - } // Uses UTC time to avoid scheduler is impacted by different timezone. final long triggerAtMillis = getTriggerAtMillis(Clock.systemUTC()); mAlarmManager.setExactAndAllowWhileIdle( @@ -111,13 +107,4 @@ public final class PeriodicJobManager { broadcastIntent, PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE); } - - private boolean canScheduleExactAlarms() { - return canScheduleExactAlarms(mAlarmManager); - } - - /** Whether we can schedule exact alarm or not? */ - public static boolean canScheduleExactAlarms(AlarmManager alarmManager) { - return alarmManager.canScheduleExactAlarms(); - } } diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BootBroadcastReceiverTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BootBroadcastReceiverTest.java index e42d6f58a73..b67066d3be0 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BootBroadcastReceiverTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BootBroadcastReceiverTest.java @@ -58,7 +58,6 @@ public final class BootBroadcastReceiverTest { mContext = ApplicationProvider.getApplicationContext(); mPeriodicJobManager = PeriodicJobManager.getInstance(mContext); mShadowAlarmManager = shadowOf(mContext.getSystemService(AlarmManager.class)); - ShadowAlarmManager.setCanScheduleExactAlarms(true); mReceiver = new BootBroadcastReceiver(); // Inserts fake data into database for testing. diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PeriodicJobManagerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PeriodicJobManagerTest.java index 2ee21f56af3..9e27bb094d0 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PeriodicJobManagerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PeriodicJobManagerTest.java @@ -48,7 +48,6 @@ public final class PeriodicJobManagerTest { mContext = ApplicationProvider.getApplicationContext(); mPeriodicJobManager = PeriodicJobManager.getInstance(mContext); mShadowAlarmManager = shadowOf(mContext.getSystemService(AlarmManager.class)); - ShadowAlarmManager.setCanScheduleExactAlarms(true); } @After @@ -68,15 +67,6 @@ public final class PeriodicJobManagerTest { assertThat(alarm.operation).isNotNull(); } - @Test - public void refreshJob_withoutPermission_notRefreshesAlarmJob() { - ShadowAlarmManager.setCanScheduleExactAlarms(false); - - mPeriodicJobManager.refreshJob(); - - assertThat(mShadowAlarmManager.peekNextScheduledAlarm()).isNull(); - } - @Test public void getTriggerAtMillis_withoutOffset_returnsExpectedResult() { long timeSlotUnit = PeriodicJobManager.DATA_FETCH_INTERVAL_MINUTE; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PeriodicJobReceiverTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PeriodicJobReceiverTest.java index b14ca80901b..3693209a98f 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PeriodicJobReceiverTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PeriodicJobReceiverTest.java @@ -58,7 +58,6 @@ public final class PeriodicJobReceiverTest { mContext = ApplicationProvider.getApplicationContext(); mPeriodicJobManager = PeriodicJobManager.getInstance(mContext); mShadowAlarmManager = shadowOf(mContext.getSystemService(AlarmManager.class)); - ShadowAlarmManager.setCanScheduleExactAlarms(true); mReceiver = new PeriodicJobReceiver(); // Inserts fake data into database for testing.