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

Merge "Remove references to POWER_COMPONENT_USAGE and TIME_COMPONENT_USAGE" into sc-dev

Browse Source
This commit is contained in:
Dmitri Plotnikov
2021-04-14 17:50:25 +00:00
committed by Android (Google) Code Review
parent 5467d0f7aa 470839a3b7
commit 3ac49f0a9b
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/com/android/settings/fuelgauge/BatteryAppListPreferenceController.java
View File

@@ -444,7 +444,7 @@ public class BatteryAppListPreferenceController extends AbstractPreferenceContro
SystemBatteryConsumer.DRAIN_TYPE_WIFI,
}) {
builder.getOrCreateSystemBatteryConsumerBuilder(drainType)
.setConsumedPower(BatteryConsumer.POWER_COMPONENT_USAGE, use);
.setConsumedPower(BatteryConsumer.POWER_COMPONENT_CPU, use);
use += 5;
}
@@ -452,26 +452,27 @@ public class BatteryAppListPreferenceController extends AbstractPreferenceContro
for (int i = 0; i < 100; i++) {
builder.getOrCreateUidBatteryConsumerBuilder(
new FakeUid(Process.FIRST_APPLICATION_UID + i))
.setTimeInStateMs(BatteryConsumer.TIME_COMPONENT_USAGE, 10000 + i * 1000)
.setConsumedPower(BatteryConsumer.POWER_COMPONENT_USAGE, use);
.setTimeInStateMs(UidBatteryConsumer.STATE_FOREGROUND, 10000 + i * 1000)
.setTimeInStateMs(UidBatteryConsumer.STATE_BACKGROUND, 20000 + i * 2000)
.setConsumedPower(BatteryConsumer.POWER_COMPONENT_CPU, use);
use += 1;
}
// Simulate dex2oat process.
builder.getOrCreateUidBatteryConsumerBuilder(new FakeUid(Process.FIRST_APPLICATION_UID))
.setTimeInStateMs(BatteryConsumer.TIME_COMPONENT_USAGE, 100000)
.setConsumedPower(BatteryConsumer.POWER_COMPONENT_USAGE, 1000.0)
.setUsageDurationMillis(BatteryConsumer.TIME_COMPONENT_CPU, 100000)
.setConsumedPower(BatteryConsumer.POWER_COMPONENT_CPU, 1000.0)
.setPackageWithHighestDrain("dex2oat");
builder.getOrCreateUidBatteryConsumerBuilder(new FakeUid(Process.FIRST_APPLICATION_UID + 1))
.setTimeInStateMs(BatteryConsumer.TIME_COMPONENT_USAGE, 100000)
.setConsumedPower(BatteryConsumer.POWER_COMPONENT_USAGE, 1000.0)
.setUsageDurationMillis(BatteryConsumer.TIME_COMPONENT_CPU, 100000)
.setConsumedPower(BatteryConsumer.POWER_COMPONENT_CPU, 1000.0)
.setPackageWithHighestDrain("dex2oat");
builder.getOrCreateUidBatteryConsumerBuilder(
new FakeUid(UserHandle.getSharedAppGid(Process.LOG_UID)))
.setTimeInStateMs(BatteryConsumer.TIME_COMPONENT_USAGE, 100000)
.setConsumedPower(BatteryConsumer.POWER_COMPONENT_USAGE, 900.0);
.setUsageDurationMillis(BatteryConsumer.TIME_COMPONENT_CPU, 100000)
.setConsumedPower(BatteryConsumer.POWER_COMPONENT_CPU, 900.0);
return builder.build();
}

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

@@ -35,7 +35,6 @@ import android.os.UserBatteryConsumer;
import android.os.UserHandle;
import android.os.UserManager;
import android.util.Log;
import android.util.Pair;
import androidx.annotation.NonNull;
@@ -462,8 +461,10 @@ public class BatteryEntry {
if (mBatteryConsumer instanceof UidBatteryConsumer) {
return ((UidBatteryConsumer) mBatteryConsumer).getTimeInStateMs(
UidBatteryConsumer.STATE_FOREGROUND);
} else if (mBatteryConsumer instanceof SystemBatteryConsumer) {
return ((SystemBatteryConsumer) mBatteryConsumer).getUsageDurationMillis();
} else {
return mBatteryConsumer.getUsageDurationMillis(BatteryConsumer.TIME_COMPONENT_USAGE);
return 0;
}
}

6
tests/robotests/src/com/android/settings/fuelgauge/BatteryEntryTest.java
View File

@@ -28,7 +28,6 @@ import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.os.BatteryConsumer;
import android.os.Handler;
import android.os.Process;
import android.os.SystemBatteryConsumer;
@@ -178,8 +177,7 @@ public class BatteryEntryTest {
final BatteryEntry entry = new BatteryEntry(RuntimeEnvironment.application, mockHandler,
mockUserManager, mSystemBatteryConsumer, false, null, null);
when(mSystemBatteryConsumer.getUsageDurationMillis(BatteryConsumer.TIME_COMPONENT_USAGE))
.thenReturn(100L);
when(mSystemBatteryConsumer.getUsageDurationMillis()).thenReturn(100L);
assertThat(entry.getTimeInForegroundMs()).isEqualTo(100L);
}
@@ -200,7 +198,7 @@ public class BatteryEntryTest {
final BatteryEntry entry = new BatteryEntry(RuntimeEnvironment.application, mockHandler,
mockUserManager, mSystemBatteryConsumer, false, null, null);
when(mSystemBatteryConsumer.getUsageDurationMillis(BatteryConsumer.TIME_COMPONENT_USAGE))
when(mSystemBatteryConsumer.getUsageDurationMillis())
.thenReturn(100L);
assertThat(entry.getTimeInBackgroundMs()).isEqualTo(0);