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

Merge "Update method isSmartBatteryEnabled()" into pi-dev

Browse Source 
am: 3feb2f87ff

Change-Id: Ia4a5ca96a43eb4b9c2ad03f1f89c3bb4e6dfa632
This commit is contained in:
Lei Yu
2018-05-16 19:56:01 -07:00
committed by android-build-merger
parent a7914f54df 3feb2f87ff
commit c409db681d
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -131,6 +131,7 @@ public class PowerUsageFeatureProviderImpl implements PowerUsageFeatureProvider
@Override
public boolean isSmartBatterySupported() {
return false;
return mContext.getResources().getBoolean(
com.android.internal.R.bool.config_smart_battery_available);
}
}

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

@@ -17,6 +17,7 @@
package com.android.settings.fuelgauge;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.when;
import android.content.Context;
@@ -29,6 +30,7 @@ import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
@@ -43,7 +45,7 @@ public class PowerUsageFeatureProviderImplTest {
private static final String[] PACKAGES_MEDIA = {"com.android.providers.media"};
private static final String[] PACKAGES_SYSTEMUI = {"com.android.systemui"};
@Mock
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Context mContext;
@Mock
private BatterySipper mBatterySipper;
@@ -55,6 +57,7 @@ public class PowerUsageFeatureProviderImplTest {
public void setUp() {
MockitoAnnotations.initMocks(this);
when(mContext.getApplicationContext()).thenReturn(mContext);
mPowerFeatureProvider = new PowerUsageFeatureProviderImpl(mContext);
when(mPackageManager.getPackagesForUid(UID_CALENDAR)).thenReturn(PACKAGES_CALENDAR);
when(mPackageManager.getPackagesForUid(UID_MEDIA)).thenReturn(PACKAGES_MEDIA);
@@ -138,7 +141,18 @@ public class PowerUsageFeatureProviderImplTest {
}
@Test
public void testIsSmartBatterySupported_returnFalse() {
public void testIsSmartBatterySupported_smartBatterySupported_returnTrue() {
when(mContext.getResources().getBoolean(
com.android.internal.R.bool.config_smart_battery_available)).thenReturn(true);
assertThat(mPowerFeatureProvider.isSmartBatterySupported()).isTrue();
}
@Test
public void testIsSmartBatterySupported_smartBatteryNotSupported_returnFalse() {
when(mContext.getResources().getBoolean(
com.android.internal.R.bool.config_smart_battery_available)).thenReturn(false);
assertThat(mPowerFeatureProvider.isSmartBatterySupported()).isFalse();
}
}