diff --git a/src/com/android/settings/fuelgauge/BatteryUtils.java b/src/com/android/settings/fuelgauge/BatteryUtils.java index 2b798557767..3c493b9eb65 100644 --- a/src/com/android/settings/fuelgauge/BatteryUtils.java +++ b/src/com/android/settings/fuelgauge/BatteryUtils.java @@ -397,7 +397,7 @@ public class BatteryUtils { public void setForceAppStandby(int uid, String packageName, int mode) { - final boolean isPreOApp = isLegacyApp(packageName); + final boolean isPreOApp = isPreOApp(packageName); if (isPreOApp) { // Control whether app could run in the background if it is pre O app mAppOpsManager.setMode(AppOpsManager.OP_RUN_IN_BACKGROUND, uid, packageName, mode); @@ -483,7 +483,7 @@ public class BatteryUtils { return 0; } - public boolean isLegacyApp(final String packageName) { + public boolean isPreOApp(final String packageName) { try { ApplicationInfo info = mPackageManager.getApplicationInfo(packageName, PackageManager.GET_META_DATA); diff --git a/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java b/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java index 5d0e71d150d..c2af02a0ec9 100644 --- a/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java +++ b/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java @@ -127,7 +127,7 @@ public class AnomalyDetectionJobService extends JobService { && !isSystemUid(uid)) { if (anomalyType == StatsManagerConfig.AnomalyType.EXCESSIVE_BG) { // TODO(b/72385333): check battery percentage draining in batterystats - if (batteryUtils.isLegacyApp(packageName) && batteryUtils.isAppHeavilyUsed( + if (batteryUtils.isPreOApp(packageName) && batteryUtils.isAppHeavilyUsed( batteryStatsHelper, userManager, uid, policy.excessiveBgDrainPercentage)) { Log.e(TAG, "Excessive detected uid=" + uid); diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java index 6518b8e89e0..8b1076d8634 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java @@ -516,12 +516,12 @@ public class BatteryUtilsTest { @Test public void testIsLegacyApp_SdkLowerThanO_ReturnTrue() { - assertThat(mBatteryUtils.isLegacyApp(LOW_SDK_PACKAGE)).isTrue(); + assertThat(mBatteryUtils.isPreOApp(LOW_SDK_PACKAGE)).isTrue(); } @Test public void testIsLegacyApp_SdkLargerOrEqualThanO_ReturnFalse() { - assertThat(mBatteryUtils.isLegacyApp(HIGH_SDK_PACKAGE)).isFalse(); + assertThat(mBatteryUtils.isPreOApp(HIGH_SDK_PACKAGE)).isFalse(); } @Test