Add batterysipper type check in PowerUsageFeatureProvider

This cl adds isTypeSystem to PowerUsageFeatureProvider and
changes isTypeService. After this cl, the following items will
be moved to advanced battery page:
1. Calendar Storage(Move to System)
2. MediaServer(Move to System)

Create this check in FeatureProvider to make sure this check
is flexible in different cases. Also refactor the PowerUsageSummary
to use same test fragment

Bug: 35629871
Bug: 35628690
Bug: 35317876
Test: RunSettingsRoboTest
Change-Id: I8c083cb2557a7e900aea01e682c13a000bacb7a9
This commit is contained in:
jackqdyulei
2017-02-23 17:31:00 -08:00
parent 0497ee9731
commit 238c1c000b
8 changed files with 267 additions and 99 deletions

View File

@@ -1,3 +1,18 @@
/*
* Copyright (C) 2017 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.fuelgauge;
import android.content.pm.PackageManager;
@@ -70,13 +85,10 @@ public class PowerUsageAdvancedTest {
@Test
public void testExtractUsageType_TypeSystem_ReturnSystem() {
mBatterySipper.drainType = DrainType.APP;
final int uids[] = {Process.SYSTEM_UID, Process.ROOT_UID};
when(mPowerUsageFeatureProvider.isTypeSystem(any())).thenReturn(true);
for (int uid : uids) {
when(mBatterySipper.getUid()).thenReturn(uid);
assertThat(mPowerUsageAdvanced.extractUsageType(mBatterySipper))
.isEqualTo(UsageType.SYSTEM);
}
assertThat(mPowerUsageAdvanced.extractUsageType(mBatterySipper))
.isEqualTo(UsageType.SYSTEM);
}
@Test