boolean shouldHideSipper(BatterySipper sipper) {
final DrainType drainType = sipper.drainType;
- return drainType == DrainType.IDLE || drainType == DrainType.CELL
- || drainType == DrainType.SCREEN || drainType == DrainType.BLUETOOTH
+ return drainType == DrainType.IDLE
+ || drainType == DrainType.CELL
+ || drainType == DrainType.WIFI
+ || drainType == DrainType.SCREEN
+ || drainType == DrainType.BLUETOOTH
|| (sipper.totalPowerMah * SECONDS_IN_HOUR) < MIN_POWER_THRESHOLD_MILLI_AMP
|| mPowerFeatureProvider.isTypeService(sipper)
|| mPowerFeatureProvider.isTypeSystem(sipper);
private static final int UID_OTHER = Process.FIRST_APPLICATION_UID + 2;
private static final int UID_CALENDAR = Process.FIRST_APPLICATION_UID + 3;
private static final int UID_MEDIA = Process.FIRST_APPLICATION_UID + 4;
+ private static final int UID_SYSTEMUI = Process.FIRST_APPLICATION_UID + 5;
private static final String[] PACKAGES_CALENDAR = {"com.android.providers.calendar"};
private static final String[] PACKAGES_MEDIA = {"com.android.providers.media"};
+ private static final String[] PACKAGES_SYSTEMUI = {"com.android.systemui"};
@Mock
private Context mContext;
@Mock
mPowerFeatureProvider = 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;
mBatterySipper.uidObj = new FakeUid(UID_OTHER);
}
@Test
- public void testIsTypeSystem_UidRoot_ReturnTrue() {
+ public void testIsTypeSystem_uidRoot_returnTrue() {
mBatterySipper.drainType = BatterySipper.DrainType.APP;
when(mBatterySipper.getUid()).thenReturn(Process.ROOT_UID);
}
@Test
- public void testIsTypeSystem_UidSystem_ReturnTrue() {
+ public void testIsTypeSystem_uidSystem_returnTrue() {
mBatterySipper.drainType = BatterySipper.DrainType.APP;
when(mBatterySipper.getUid()).thenReturn(Process.SYSTEM_UID);
}
@Test
- public void testIsTypeSystem_UidMedia_ReturnTrue() {
+ public void testIsTypeSystem_uidMedia_returnTrue() {
mBatterySipper.drainType = BatterySipper.DrainType.APP;
when(mBatterySipper.getUid()).thenReturn(Process.MEDIA_UID);
}
@Test
- public void testIsTypeSystem_AppCalendar_ReturnTrue() {
+ public void testIsTypeSystem_appCalendar_returnTrue() {
mBatterySipper.drainType = BatterySipper.DrainType.APP;
when(mBatterySipper.getUid()).thenReturn(UID_CALENDAR);
}
@Test
- public void testIsTypeSystem_AppMedia_ReturnTrue() {
+ public void testIsTypeSystem_appMedia_returnTrue() {
mBatterySipper.drainType = BatterySipper.DrainType.APP;
when(mBatterySipper.getUid()).thenReturn(UID_MEDIA);
}
@Test
- public void testIsTypeSystem_UidOther_ReturnFalse() {
+ public void testIsTypeSystem_appSystemUi_returnTrue() {
+ mBatterySipper.drainType = BatterySipper.DrainType.APP;
+ when(mBatterySipper.getUid()).thenReturn(UID_SYSTEMUI);
+
+ assertThat(mPowerFeatureProvider.isTypeSystem(mBatterySipper)).isTrue();
+ }
+
+ @Test
+ public void testIsTypeSystem_uidOther_returnFalse() {
mBatterySipper.drainType = BatterySipper.DrainType.APP;
when(mBatterySipper.getUid()).thenReturn(UID_OTHER);
}
@Test
- public void testIsTypeSystem_UidObjNull_ReturnFalse() {
+ public void testIsTypeSystem_uidObjNull_returnFalse() {
mBatterySipper.drainType = BatterySipper.DrainType.APP;
mBatterySipper.uidObj = null;