PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Provide different ways to detect battery defender.

Browse Source 
Bug: 335567248
Test: robotests
Change-Id: Ie1d3d7da99fa698468ffd124410cfd3b56bc0c34
This commit is contained in:
Yiling Chuang
2024-04-25 08:00:59 +00:00
parent c44d4f3f6f
commit 11e810e7a7
5 changed files with 74 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java
View File

@@ -151,4 +151,7 @@ public interface PowerUsageFeatureProvider {
/** Whether the app optimization mode is valid to restore */
boolean isValidToRestoreOptimizationMode(ArrayMap<String, String> deviceInfoMap);
/** Whether the device is under the battery defender mode */
boolean isBatteryDefend(BatteryInfo info);
}

5
src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java
View File

@@ -235,4 +235,9 @@ public class PowerUsageFeatureProviderImpl implements PowerUsageFeatureProvider
public boolean isValidToRestoreOptimizationMode(ArrayMap<String, String> deviceInfoMap) {
return false;
}
@Override
public boolean isBatteryDefend(BatteryInfo info) {
return info.isBatteryDefender && !isExtraDefend();
}
}

5
src/com/android/settings/fuelgauge/batterytip/detectors/BatteryDefenderDetector.java
View File

@@ -36,10 +36,9 @@ public class BatteryDefenderDetector implements BatteryTipDetector {
@Override
public BatteryTip detect() {
final boolean isBasicBatteryDefend =
mBatteryInfo.isBatteryDefender
&& !FeatureFactory.getFeatureFactory()
FeatureFactory.getFeatureFactory()
.getPowerUsageFeatureProvider()
.isExtraDefend();
.isBatteryDefend(mBatteryInfo);
final int state =
isBasicBatteryDefend ? BatteryTip.StateType.NEW : BatteryTip.StateType.INVISIBLE;
final boolean isPluggedIn = mBatteryInfo.pluggedStatus != 0;

71
tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java
View File

@@ -18,6 +18,8 @@ package com.android.settings.fuelgauge;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
import android.content.Context;
@@ -48,6 +50,8 @@ public class PowerUsageFeatureProviderImplTest {
private Context mContext;
@Mock private PackageManager mPackageManager;
@Mock private BatteryInfo mBatteryInfo;
private PowerUsageFeatureProviderImpl mPowerFeatureProvider;
@Before
@@ -55,73 +59,74 @@ public class PowerUsageFeatureProviderImplTest {
MockitoAnnotations.initMocks(this);
when(mContext.getApplicationContext()).thenReturn(mContext);
mPowerFeatureProvider = new PowerUsageFeatureProviderImpl(mContext);
mPowerFeatureProvider = spy(new PowerUsageFeatureProviderImpl(mContext));
when(mPackageManager.getPackagesForUid(UID_CALENDAR)).thenReturn(PACKAGES_CALENDAR);
when(mPackageManager.getPackagesForUid(UID_MEDIA)).thenReturn(PACKAGES_MEDIA);
when(mPackageManager.getPackagesForUid(UID_SYSTEMUI)).thenReturn(PACKAGES_SYSTEMUI);
mPowerFeatureProvider.mPackageManager = mPackageManager;
mBatteryInfo.discharging = false;
}
@Test
public void testIsBatteryUsageEnabled_returnFalse() {
public void isBatteryUsageEnabled_returnFalse() {
assertThat(mPowerFeatureProvider.isBatteryUsageEnabled()).isTrue();
}
@Test
public void testIsBatteryTipsEnabled_returnFalse() {
public void isBatteryTipsEnabled_returnFalse() {
assertThat(mPowerFeatureProvider.isBatteryTipsEnabled()).isFalse();
}
@Test
public void testIsAppOptimizationModeLogged_returnFalse() {
public void isAppOptimizationModeLogged_returnFalse() {
assertThat(mPowerFeatureProvider.isAppOptimizationModeLogged()).isFalse();
}
@Test
public void testGetBatteryUsageListConsumePowerThreshold_return0() {
public void getBatteryUsageListConsumePowerThreshold_return0() {
assertThat(mPowerFeatureProvider.getBatteryUsageListConsumePowerThreshold()).isEqualTo(0.0);
}
@Test
public void testIsTypeSystem_uidRoot_returnTrue() {
public void isTypeSystem_uidRoot_returnTrue() {
assertThat(mPowerFeatureProvider.isTypeSystem(Process.ROOT_UID, null)).isTrue();
}
@Test
public void testIsTypeSystem_uidSystem_returnTrue() {
public void isTypeSystem_uidSystem_returnTrue() {
assertThat(mPowerFeatureProvider.isTypeSystem(Process.SYSTEM_UID, null)).isTrue();
}
@Test
public void testIsTypeSystem_uidMedia_returnTrue() {
public void isTypeSystem_uidMedia_returnTrue() {
assertThat(mPowerFeatureProvider.isTypeSystem(Process.MEDIA_UID, null)).isTrue();
}
@Test
@Ignore
public void testIsTypeSystem_appCalendar_returnTrue() {
public void isTypeSystem_appCalendar_returnTrue() {
assertThat(mPowerFeatureProvider.isTypeSystem(UID_CALENDAR, null)).isTrue();
}
@Test
@Ignore
public void testIsTypeSystem_appMedia_returnTrue() {
public void isTypeSystem_appMedia_returnTrue() {
assertThat(mPowerFeatureProvider.isTypeSystem(UID_MEDIA, null)).isTrue();
}
@Test
@Ignore
public void testIsTypeSystem_appSystemUi_returnTrue() {
public void isTypeSystem_appSystemUi_returnTrue() {
assertThat(mPowerFeatureProvider.isTypeSystem(UID_SYSTEMUI, null)).isTrue();
}
@Test
public void testIsTypeSystem_uidOther_returnFalse() {
public void isTypeSystem_uidOther_returnFalse() {
assertThat(mPowerFeatureProvider.isTypeSystem(UID_OTHER, null)).isFalse();
}
@Test
public void testIsSmartBatterySupported_smartBatterySupported_returnTrue() {
public void isSmartBatterySupported_smartBatterySupported_returnTrue() {
when(mContext.getResources()
.getBoolean(com.android.internal.R.bool.config_smart_battery_available))
.thenReturn(true);
@@ -130,7 +135,7 @@ public class PowerUsageFeatureProviderImplTest {
}
@Test
public void testIsSmartBatterySupported_smartBatteryNotSupported_returnFalse() {
public void isSmartBatterySupported_smartBatteryNotSupported_returnFalse() {
when(mContext.getResources()
.getBoolean(com.android.internal.R.bool.config_smart_battery_available))
.thenReturn(false);
@@ -139,17 +144,49 @@ public class PowerUsageFeatureProviderImplTest {
}
@Test
public void testIsAdaptiveChargingSupported_returnFalse() {
public void isAdaptiveChargingSupported_returnFalse() {
assertThat(mPowerFeatureProvider.isAdaptiveChargingSupported()).isFalse();
}
@Test
public void testGetResumeChargeIntentWithoutDockDefender_returnNull() {
public void getResumeChargeIntentWithoutDockDefender_returnNull() {
assertThat(mPowerFeatureProvider.getResumeChargeIntent(false)).isNull();
}
@Test
public void testGetResumeChargeIntentWithDockDefender_returnNull() {
public void getResumeChargeIntentWithDockDefender_returnNull() {
assertThat(mPowerFeatureProvider.getResumeChargeIntent(true)).isNull();
}
@Test
public void isBatteryDefend_defenderModeAndExtraDefendAreFalse_returnFalse() {
mBatteryInfo.isBatteryDefender = false;
doReturn(false).when(mPowerFeatureProvider).isExtraDefend();
assertThat(mPowerFeatureProvider.isBatteryDefend(mBatteryInfo)).isFalse();
}
@Test
public void isBatteryDefend_defenderModeIsFalse_returnFalse() {
mBatteryInfo.isBatteryDefender = false;
doReturn(true).when(mPowerFeatureProvider).isExtraDefend();
assertThat(mPowerFeatureProvider.isBatteryDefend(mBatteryInfo)).isFalse();
}
@Test
public void isBatteryDefend_defenderModeAndExtraDefendAreTrue_returnFalse() {
mBatteryInfo.isBatteryDefender = true;
doReturn(true).when(mPowerFeatureProvider).isExtraDefend();
assertThat(mPowerFeatureProvider.isBatteryDefend(mBatteryInfo)).isFalse();
}
@Test
public void isBatteryDefend_extraDefendIsFalse_returnTrue() {
mBatteryInfo.isBatteryDefender = true;
doReturn(false).when(mPowerFeatureProvider).isExtraDefend();
assertThat(mPowerFeatureProvider.isBatteryDefend(mBatteryInfo)).isTrue();
}
}

39
tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/BatteryDefenderDetectorTest.java
View File

@@ -40,53 +40,32 @@ public class BatteryDefenderDetectorTest {
@Mock private BatteryInfo mBatteryInfo;
private BatteryDefenderDetector mBatteryDefenderDetector;
private Context mContext;
private FakeFeatureFactory mFakeFeatureFactory;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mBatteryInfo.discharging = false;
mContext = ApplicationProvider.getApplicationContext();
mBatteryDefenderDetector = new BatteryDefenderDetector(mBatteryInfo, mContext);
final Context context = ApplicationProvider.getApplicationContext();
mBatteryDefenderDetector = new BatteryDefenderDetector(mBatteryInfo, context);
mFakeFeatureFactory = FakeFeatureFactory.setupForTest();
}
@Test
public void testDetect_notDefenderNotExtraDefend_tipInvisible() {
mBatteryInfo.isBatteryDefender = false;
when(mFakeFeatureFactory.powerUsageFeatureProvider.isExtraDefend()).thenReturn(false);
public void detect_notBatteryDefend_tipInvisible() {
when(mFakeFeatureFactory.powerUsageFeatureProvider.isBatteryDefend(mBatteryInfo))
.thenReturn(false);
assertThat(mBatteryDefenderDetector.detect().isVisible()).isFalse();
}
@Test
public void testDetect_notDefenderIsExtraDefend_tipInvisible() {
mBatteryInfo.isBatteryDefender = false;
when(mFakeFeatureFactory.powerUsageFeatureProvider.isExtraDefend()).thenReturn(true);
assertThat(mBatteryDefenderDetector.detect().isVisible()).isFalse();
}
@Test
public void testDetect_isDefenderIsExtraDefend_tipInvisible() {
mBatteryInfo.isBatteryDefender = false;
when(mFakeFeatureFactory.powerUsageFeatureProvider.isExtraDefend()).thenReturn(true);
assertThat(mBatteryDefenderDetector.detect().isVisible()).isFalse();
}
@Test
public void testDetect_isDefenderNotExtraDefend_tipNew() {
mBatteryInfo.isBatteryDefender = true;
when(mFakeFeatureFactory.powerUsageFeatureProvider.isExtraDefend()).thenReturn(false);
public void detect_isBatteryDefend_tipNew() {
when(mFakeFeatureFactory.powerUsageFeatureProvider.isBatteryDefend(mBatteryInfo))
.thenReturn(true);
assertThat(mBatteryDefenderDetector.detect().getState())
.isEqualTo(BatteryTip.StateType.NEW);
assertThat(mBatteryDefenderDetector.detect().isVisible()).isTrue();
}
}