From cf1190c7cb7c577dfdb6a20a9fb74990dc29fa43 Mon Sep 17 00:00:00 2001 From: Wesley Wang Date: Wed, 19 Apr 2023 20:00:31 +0800 Subject: [PATCH] Update battery health state intent (2/3) - Update the extra from overheated to longlife Bug: 278192441 Test: make SettingsRoboTests Change-Id: I5a906e64effbd9aaf84446c0670249afefdf7da8 --- .../fuelgauge/BatteryBroadcastReceiver.java | 31 ++++++++++++------- .../settings/fuelgauge/BatteryInfo.java | 10 +++--- .../settings/fuelgauge/BatteryUtils.java | 9 +++--- .../detectors/BatteryDefenderDetector.java | 15 +++++---- .../BatteryBroadcastReceiverTest.java | 20 ++++++++++-- ...BatteryHeaderPreferenceControllerTest.java | 4 +-- .../settings/fuelgauge/BatteryInfoTest.java | 19 ++++++------ .../settings/fuelgauge/BatteryUtilsTest.java | 16 +++++----- .../BatteryDefenderDetectorTest.java | 16 +++++----- .../detectors/DockDefenderDetectorTest.java | 8 ++--- 10 files changed, 85 insertions(+), 63 deletions(-) diff --git a/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java b/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java index 81a15ca7275..79ecd4076ae 100644 --- a/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java +++ b/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java @@ -34,24 +34,20 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; /** - * Use this broadcastReceiver to listen to the battery change, and it will invoke - * {@link OnBatteryChangedListener} if any of the following has been changed: - * - * 1. Battery level(e.g. 100%->99%) - * 2. Battery status(e.g. plugged->unplugged) - * 3. Battery saver(e.g. off->on) - * 4. Battery health(e.g. good->overheat) + * Use this broadcastReceiver to listen to the battery change and it will invoke + * {@link OnBatteryChangedListener} */ public class BatteryBroadcastReceiver extends BroadcastReceiver { private static final String TAG = "BatteryBroadcastRcvr"; /** - * Callback when the following has been changed: + * Callback if any of the monitored fields has been changed: * * Battery level(e.g. 100%->99%) * Battery status(e.g. plugged->unplugged) * Battery saver(e.g. off->on) * Battery health(e.g. good->overheat) + * Battery charging status(e.g. default->long life) */ public interface OnBatteryChangedListener { void onBatteryChanged(@BatteryUpdateType int type); @@ -63,6 +59,7 @@ public class BatteryBroadcastReceiver extends BroadcastReceiver { BatteryUpdateType.BATTERY_SAVER, BatteryUpdateType.BATTERY_STATUS, BatteryUpdateType.BATTERY_HEALTH, + BatteryUpdateType.CHARGING_STATUS, BatteryUpdateType.BATTERY_NOT_PRESENT}) public @interface BatteryUpdateType { int MANUAL = 0; @@ -70,7 +67,8 @@ public class BatteryBroadcastReceiver extends BroadcastReceiver { int BATTERY_SAVER = 2; int BATTERY_STATUS = 3; int BATTERY_HEALTH = 4; - int BATTERY_NOT_PRESENT = 5; + int CHARGING_STATUS = 5; + int BATTERY_NOT_PRESENT = 6; } @VisibleForTesting @@ -78,6 +76,8 @@ public class BatteryBroadcastReceiver extends BroadcastReceiver { @VisibleForTesting String mBatteryStatus; @VisibleForTesting + int mChargingStatus; + @VisibleForTesting int mBatteryHealth; private OnBatteryChangedListener mBatteryListener; private Context mContext; @@ -121,21 +121,27 @@ public class BatteryBroadcastReceiver extends BroadcastReceiver { final String batteryLevel = Utils.getBatteryPercentage(intent); final String batteryStatus = Utils.getBatteryStatus(mContext, intent, /* compactStatus= */ false); + final int chargingStatus = intent.getIntExtra( + BatteryManager.EXTRA_CHARGING_STATUS, BatteryManager.CHARGING_POLICY_DEFAULT); final int batteryHealth = intent.getIntExtra( BatteryManager.EXTRA_HEALTH, BatteryManager.BATTERY_HEALTH_UNKNOWN); Log.d( TAG, - "Battery changed: level=" + "Battery changed: level: " + batteryLevel - + ", status=" + + "| status: " + batteryStatus - + ", health=" + + "| chargingStatus: " + + chargingStatus + + "| health: " + batteryHealth); if (!Utils.isBatteryPresent(intent)) { Log.w(TAG, "Problem reading the battery meter."); mBatteryListener.onBatteryChanged(BatteryUpdateType.BATTERY_NOT_PRESENT); } else if (forceUpdate) { mBatteryListener.onBatteryChanged(BatteryUpdateType.MANUAL); + } else if (chargingStatus != mChargingStatus) { + mBatteryListener.onBatteryChanged(BatteryUpdateType.CHARGING_STATUS); } else if (batteryHealth != mBatteryHealth) { mBatteryListener.onBatteryChanged(BatteryUpdateType.BATTERY_HEALTH); } else if(!batteryLevel.equals(mBatteryLevel)) { @@ -145,6 +151,7 @@ public class BatteryBroadcastReceiver extends BroadcastReceiver { } mBatteryLevel = batteryLevel; mBatteryStatus = batteryStatus; + mChargingStatus = chargingStatus; mBatteryHealth = batteryHealth; } else if (PowerManager.ACTION_POWER_SAVE_MODE_CHANGED.equals(action)) { mBatteryListener.onBatteryChanged(BatteryUpdateType.BATTERY_SAVER); diff --git a/src/com/android/settings/fuelgauge/BatteryInfo.java b/src/com/android/settings/fuelgauge/BatteryInfo.java index d164e931a21..e7eb947848f 100644 --- a/src/com/android/settings/fuelgauge/BatteryInfo.java +++ b/src/com/android/settings/fuelgauge/BatteryInfo.java @@ -51,7 +51,7 @@ public class BatteryInfo { public int batteryStatus; public int pluggedStatus; public boolean discharging = true; - public boolean isOverheated; + public boolean isBatteryDefender; public long remainingTimeUs = 0; public long averageTimeToDischarge = EstimateKt.AVERAGE_TIME_TO_DISCHARGE_UNKNOWN; public String batteryPercentString; @@ -257,9 +257,9 @@ public class BatteryInfo { info.pluggedStatus = batteryBroadcast.getIntExtra(BatteryManager.EXTRA_PLUGGED, 0); info.mCharging = info.pluggedStatus != 0; info.averageTimeToDischarge = estimate.getAverageDischargeTime(); - info.isOverheated = batteryBroadcast.getIntExtra( - BatteryManager.EXTRA_HEALTH, BatteryManager.BATTERY_HEALTH_UNKNOWN) - == BatteryManager.BATTERY_HEALTH_OVERHEAT; + info.isBatteryDefender = batteryBroadcast.getIntExtra( + BatteryManager.EXTRA_CHARGING_STATUS, BatteryManager.CHARGING_POLICY_DEFAULT) + == BatteryManager.CHARGING_POLICY_ADAPTIVE_LONGLIFE; info.statusLabel = Utils.getBatteryStatus(context, batteryBroadcast, isCompactStatus); info.batteryStatus = batteryBroadcast.getIntExtra( @@ -283,7 +283,7 @@ public class BatteryInfo { info.discharging = false; info.suggestionLabel = null; int dockDefenderMode = BatteryUtils.getCurrentDockDefenderMode(context, info); - if ((info.isOverheated && status != BatteryManager.BATTERY_STATUS_FULL + if ((info.isBatteryDefender && status != BatteryManager.BATTERY_STATUS_FULL && dockDefenderMode == BatteryUtils.DockDefenderMode.DISABLED) || dockDefenderMode == BatteryUtils.DockDefenderMode.ACTIVE) { // Battery defender active, battery charging paused diff --git a/src/com/android/settings/fuelgauge/BatteryUtils.java b/src/com/android/settings/fuelgauge/BatteryUtils.java index 72d84ef6663..12760b18b0a 100644 --- a/src/com/android/settings/fuelgauge/BatteryUtils.java +++ b/src/com/android/settings/fuelgauge/BatteryUtils.java @@ -18,7 +18,6 @@ package com.android.settings.fuelgauge; import android.app.AppOpsManager; import android.content.Context; import android.content.Intent; -import android.content.IntentFilter; import android.content.pm.ApplicationInfo; import android.content.pm.InstallSourceInfo; import android.content.pm.PackageInfo; @@ -322,10 +321,10 @@ public class BatteryUtils { } /** - * Return {@code true} if battery is overheated and charging. + * Return {@code true} if battery defender is on and charging. */ public static boolean isBatteryDefenderOn(BatteryInfo batteryInfo) { - return batteryInfo.isOverheated && !batteryInfo.discharging; + return batteryInfo.isBatteryDefender && !batteryInfo.discharging; } /** @@ -627,11 +626,11 @@ public class BatteryUtils { if (Settings.Global.getInt(context.getContentResolver(), SETTINGS_GLOBAL_DOCK_DEFENDER_BYPASS, 0) == 1) { return DockDefenderMode.TEMPORARILY_BYPASSED; - } else if (batteryInfo.isOverheated && FeatureFactory.getFactory(context) + } else if (batteryInfo.isBatteryDefender && FeatureFactory.getFactory(context) .getPowerUsageFeatureProvider(context) .isExtraDefend()) { return DockDefenderMode.ACTIVE; - } else if (!batteryInfo.isOverheated) { + } else if (!batteryInfo.isBatteryDefender) { return DockDefenderMode.FUTURE_BYPASS; } } diff --git a/src/com/android/settings/fuelgauge/batterytip/detectors/BatteryDefenderDetector.java b/src/com/android/settings/fuelgauge/batterytip/detectors/BatteryDefenderDetector.java index 2dc057ea7a3..8b7d4c18856 100644 --- a/src/com/android/settings/fuelgauge/batterytip/detectors/BatteryDefenderDetector.java +++ b/src/com/android/settings/fuelgauge/batterytip/detectors/BatteryDefenderDetector.java @@ -37,13 +37,12 @@ public class BatteryDefenderDetector implements BatteryTipDetector { @Override public BatteryTip detect() { - final boolean isBasicBatteryDefend = mBatteryInfo.isOverheated - && !FeatureFactory.getFactory(mContext) - .getPowerUsageFeatureProvider(mContext) - .isExtraDefend(); - final int state = isBasicBatteryDefend - ? BatteryTip.StateType.NEW : BatteryTip.StateType.INVISIBLE; - final boolean isPluggedIn = mBatteryInfo.pluggedStatus != 0; - return new BatteryDefenderTip(state, isPluggedIn); + final boolean isBasicBatteryDefend = mBatteryInfo.isBatteryDefender + && !FeatureFactory.getFactory(mContext).getPowerUsageFeatureProvider(mContext) + .isExtraDefend(); + final int state = isBasicBatteryDefend + ? BatteryTip.StateType.NEW : BatteryTip.StateType.INVISIBLE; + final boolean isPluggedIn = mBatteryInfo.pluggedStatus != 0; + return new BatteryDefenderTip(state, isPluggedIn); } } diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java index a829c40e9a6..62f812d299a 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java @@ -69,6 +69,7 @@ public class BatteryBroadcastReceiverTest { mBatteryBroadcastReceiver.mBatteryLevel = BATTERY_INIT_LEVEL; mBatteryBroadcastReceiver.mBatteryStatus = BATTERY_INIT_STATUS; mBatteryBroadcastReceiver.mBatteryHealth = BatteryManager.BATTERY_HEALTH_UNKNOWN; + mBatteryBroadcastReceiver.mChargingStatus = BatteryManager.CHARGING_POLICY_DEFAULT; mBatteryBroadcastReceiver.setBatteryChangedListener(mBatteryListener); mChargingIntent = new Intent(Intent.ACTION_BATTERY_CHANGED); @@ -91,8 +92,8 @@ public class BatteryBroadcastReceiverTest { @Test public void onReceive_batteryHealthChanged_dataUpdated() { - mChargingIntent - .putExtra(BatteryManager.EXTRA_HEALTH, BatteryManager.BATTERY_HEALTH_OVERHEAT); + mChargingIntent.putExtra( + BatteryManager.EXTRA_HEALTH, BatteryManager.BATTERY_HEALTH_OVERHEAT); mBatteryBroadcastReceiver.onReceive(mContext, mChargingIntent); assertThat(mBatteryBroadcastReceiver.mBatteryHealth) @@ -100,6 +101,17 @@ public class BatteryBroadcastReceiverTest { verify(mBatteryListener).onBatteryChanged(BatteryUpdateType.BATTERY_HEALTH); } + @Test + public void onReceive_chargingStatusChanged_dataUpdated() { + mChargingIntent.putExtra(BatteryManager.EXTRA_CHARGING_STATUS, + BatteryManager.CHARGING_POLICY_ADAPTIVE_LONGLIFE); + mBatteryBroadcastReceiver.onReceive(mContext, mChargingIntent); + + assertThat(mBatteryBroadcastReceiver.mChargingStatus) + .isEqualTo(BatteryManager.CHARGING_POLICY_ADAPTIVE_LONGLIFE); + verify(mBatteryListener).onBatteryChanged(BatteryUpdateType.CHARGING_STATUS); + } + @Test public void onReceive_batteryNotPresent_shouldShowHelpMessage() { mChargingIntent.putExtra(BatteryManager.EXTRA_PRESENT, false); @@ -131,6 +143,8 @@ public class BatteryBroadcastReceiverTest { assertThat(mBatteryBroadcastReceiver.mBatteryStatus).isEqualTo(batteryStatus); assertThat(mBatteryBroadcastReceiver.mBatteryHealth) .isEqualTo(BatteryManager.BATTERY_HEALTH_UNKNOWN); + assertThat(mBatteryBroadcastReceiver.mChargingStatus) + .isEqualTo(BatteryManager.CHARGING_POLICY_DEFAULT); verify(mBatteryListener, never()).onBatteryChanged(anyInt()); } @@ -163,6 +177,8 @@ public class BatteryBroadcastReceiverTest { Utils.getBatteryStatus(mContext, mChargingIntent, /* compactStatus= */ false)); assertThat(mBatteryBroadcastReceiver.mBatteryHealth) .isEqualTo(BatteryManager.BATTERY_HEALTH_UNKNOWN); + assertThat(mBatteryBroadcastReceiver.mChargingStatus) + .isEqualTo(BatteryManager.CHARGING_POLICY_DEFAULT); // 2 times because register will force update the battery verify(mBatteryListener, times(2)).onBatteryChanged(BatteryUpdateType.MANUAL); } diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java index f94e5bf7b66..2779e0ac0c7 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java @@ -290,8 +290,8 @@ public class BatteryHeaderPreferenceControllerTest { } @Test - public void updatePreference_isOverheat_showEmptyText() { - mBatteryInfo.isOverheated = true; + public void updatePreference_isBatteryDefender_showEmptyText() { + mBatteryInfo.isBatteryDefender = true; mController.updateHeaderPreference(mBatteryInfo); diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java index eb4b598823f..09eb4d0809d 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java @@ -254,18 +254,18 @@ public class BatteryInfoTest { } @Test - public void testGetBatteryInfo_chargingWithOverheated_updateChargeLabel() { + public void testGetBatteryInfo_chargingWithDefender_updateChargeLabel() { doReturn(TEST_CHARGE_TIME_REMAINING) .when(mBatteryUsageStats) .getChargeTimeRemainingMs(); - mChargingBatteryBroadcast - .putExtra(BatteryManager.EXTRA_HEALTH, BatteryManager.BATTERY_HEALTH_OVERHEAT); + mChargingBatteryBroadcast.putExtra(BatteryManager.EXTRA_CHARGING_STATUS, + BatteryManager.CHARGING_POLICY_ADAPTIVE_LONGLIFE); BatteryInfo info = BatteryInfo.getBatteryInfo(mContext, mChargingBatteryBroadcast, mBatteryUsageStats, MOCK_ESTIMATE, SystemClock.elapsedRealtime() * 1000, false /* shortString */); - assertThat(info.isOverheated).isTrue(); + assertThat(info.isBatteryDefender).isTrue(); assertThat(info.chargeLabel.toString()).contains(STATUS_CHARGING_PAUSED); } @@ -278,7 +278,8 @@ public class BatteryInfoTest { 50 /* level */, 100 /* scale */, BatteryManager.BATTERY_STATUS_CHARGING) - .putExtra(BatteryManager.EXTRA_HEALTH, BatteryManager.BATTERY_HEALTH_OVERHEAT); + .putExtra(BatteryManager.EXTRA_CHARGING_STATUS, + BatteryManager.CHARGING_POLICY_ADAPTIVE_LONGLIFE); BatteryInfo info = BatteryInfo.getBatteryInfo(mContext, intent, mBatteryUsageStats, MOCK_ESTIMATE, SystemClock.elapsedRealtime() * 1000, @@ -290,8 +291,8 @@ public class BatteryInfoTest { @Test public void testGetBatteryInfo_dockDefenderTemporarilyBypassed_updateChargeLabel() { doReturn(REMAINING_TIME).when(mBatteryUsageStats).getChargeTimeRemainingMs(); - mChargingBatteryBroadcast - .putExtra(BatteryManager.EXTRA_HEALTH, BatteryManager.BATTERY_HEALTH_GOOD); + mChargingBatteryBroadcast.putExtra(BatteryManager.EXTRA_CHARGING_STATUS, + BatteryManager.CHARGING_POLICY_DEFAULT); Settings.Global.putInt(mContext.getContentResolver(), BatteryUtils.SETTINGS_GLOBAL_DOCK_DEFENDER_BYPASS, 1); @@ -309,8 +310,8 @@ public class BatteryInfoTest { @Test public void testGetBatteryInfo_dockDefenderFutureBypass_updateChargeLabel() { doReturn(false).when(mFeatureFactory.powerUsageFeatureProvider).isExtraDefend(); - mChargingBatteryBroadcast - .putExtra(BatteryManager.EXTRA_HEALTH, BatteryManager.BATTERY_HEALTH_GOOD); + mChargingBatteryBroadcast.putExtra(BatteryManager.EXTRA_CHARGING_STATUS, + BatteryManager.CHARGING_POLICY_DEFAULT); BatteryInfo info = BatteryInfo.getBatteryInfo(mContext, BatteryTestUtils.getCustomBatteryIntent(BatteryManager.BATTERY_PLUGGED_DOCK, diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java index b5f81499ea5..2fe0cec63d8 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java @@ -487,32 +487,32 @@ public class BatteryUtilsTest { } @Test - public void testIsBatteryDefenderOn_isOverheatedAndIsCharging_returnTrue() { - mBatteryInfo.isOverheated = true; + public void testIsBatteryDefenderOn_isDefenderAndIsCharging_returnTrue() { + mBatteryInfo.isBatteryDefender = true; mBatteryInfo.discharging = false; assertThat(mBatteryUtils.isBatteryDefenderOn(mBatteryInfo)).isTrue(); } @Test - public void testIsBatteryDefenderOn_isOverheatedAndDischarging_returnFalse() { - mBatteryInfo.isOverheated = true; + public void testIsBatteryDefenderOn_isDefenderAndDischarging_returnFalse() { + mBatteryInfo.isBatteryDefender = true; mBatteryInfo.discharging = true; assertThat(mBatteryUtils.isBatteryDefenderOn(mBatteryInfo)).isFalse(); } @Test - public void testIsBatteryDefenderOn_notOverheatedAndDischarging_returnFalse() { - mBatteryInfo.isOverheated = false; + public void testIsBatteryDefenderOn_notDefenderAndDischarging_returnFalse() { + mBatteryInfo.isBatteryDefender = false; mBatteryInfo.discharging = true; assertThat(mBatteryUtils.isBatteryDefenderOn(mBatteryInfo)).isFalse(); } @Test - public void testIsBatteryDefenderOn_notOverheatedAndIsCharging_returnFalse() { - mBatteryInfo.isOverheated = false; + public void testIsBatteryDefenderOn_notDefenderAndIsCharging_returnFalse() { + mBatteryInfo.isBatteryDefender = false; mBatteryInfo.discharging = false; assertThat(mBatteryUtils.isBatteryDefenderOn(mBatteryInfo)).isFalse(); diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/BatteryDefenderDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/BatteryDefenderDetectorTest.java index f81a4be8d63..64d5d0460ef 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/BatteryDefenderDetectorTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/BatteryDefenderDetectorTest.java @@ -60,32 +60,32 @@ public class BatteryDefenderDetectorTest { } @Test - public void testDetect_notOverheatedNotExtraDefend_tipInvisible() { - mBatteryInfo.isOverheated = false; + public void testDetect_notDefenderNotExtraDefend_tipInvisible() { + mBatteryInfo.isBatteryDefender = false; when(mFakeFeatureFactory.powerUsageFeatureProvider.isExtraDefend()).thenReturn(false); assertThat(mBatteryDefenderDetector.detect().isVisible()).isFalse(); } @Test - public void testDetect_notOverheatedIsExtraDefend_tipInvisible() { - mBatteryInfo.isOverheated = false; + public void testDetect_notDefenderIsExtraDefend_tipInvisible() { + mBatteryInfo.isBatteryDefender = false; when(mFakeFeatureFactory.powerUsageFeatureProvider.isExtraDefend()).thenReturn(true); assertThat(mBatteryDefenderDetector.detect().isVisible()).isFalse(); } @Test - public void testDetect_isOverheatedIsExtraDefend_tipInvisible() { - mBatteryInfo.isOverheated = false; + public void testDetect_isDefenderIsExtraDefend_tipInvisible() { + mBatteryInfo.isBatteryDefender = false; when(mFakeFeatureFactory.powerUsageFeatureProvider.isExtraDefend()).thenReturn(true); assertThat(mBatteryDefenderDetector.detect().isVisible()).isFalse(); } @Test - public void testDetect_isOverheatedNotExtraDefend_tipNew() { - mBatteryInfo.isOverheated = true; + public void testDetect_isDefenderNotExtraDefend_tipNew() { + mBatteryInfo.isBatteryDefender = true; when(mFakeFeatureFactory.powerUsageFeatureProvider.isExtraDefend()).thenReturn(false); assertThat(mBatteryDefenderDetector.detect().getState()) diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/DockDefenderDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/DockDefenderDetectorTest.java index 9652a00ca18..bd2c5d1173b 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/DockDefenderDetectorTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/DockDefenderDetectorTest.java @@ -83,7 +83,7 @@ public class DockDefenderDetectorTest { @Test public void testDetect_dockDefenderActive() { - mBatteryInfo.isOverheated = true; + mBatteryInfo.isBatteryDefender = true; doReturn(true).when(mFakeFeatureFactory.powerUsageFeatureProvider).isExtraDefend(); BatteryTip batteryTip = mDockDefenderDetector.detect(); @@ -95,7 +95,7 @@ public class DockDefenderDetectorTest { @Test public void testDetect_dockDefenderFutureBypass() { - mBatteryInfo.isOverheated = false; + mBatteryInfo.isBatteryDefender = false; doReturn(false).when(mFakeFeatureFactory.powerUsageFeatureProvider).isExtraDefend(); BatteryTip batteryTip = mDockDefenderDetector.detect(); @@ -107,7 +107,7 @@ public class DockDefenderDetectorTest { @Test public void testDetect_overheatedTrue_dockDefenderDisabled() { - mBatteryInfo.isOverheated = true; + mBatteryInfo.isBatteryDefender = true; doReturn(false).when(mFakeFeatureFactory.powerUsageFeatureProvider).isExtraDefend(); BatteryTip batteryTip = mDockDefenderDetector.detect(); @@ -131,7 +131,7 @@ public class DockDefenderDetectorTest { @Test public void testDetect_overheatedTrueAndDockDefenderNotTriggered_dockDefenderDisabled() { doReturn(false).when(mFakeFeatureFactory.powerUsageFeatureProvider).isExtraDefend(); - mBatteryInfo.isOverheated = true; + mBatteryInfo.isBatteryDefender = true; BatteryTip batteryTip = mDockDefenderDetector.detect();