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 am: 3ac49f0a9b

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14078240

Change-Id: Ida4310282710b182529e038724a825e5dfd102de
This commit is contained in:
Dmitri Plotnikov
2021-04-14 18:04:56 +00:00
committed by Automerger Merge Worker
parent 3991ebebe2 3ac49f0a9b
commit ffbf5d71c8
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, SystemBatteryConsumer.DRAIN_TYPE_WIFI,
}) { }) {
builder.getOrCreateSystemBatteryConsumerBuilder(drainType) builder.getOrCreateSystemBatteryConsumerBuilder(drainType)
.setConsumedPower(BatteryConsumer.POWER_COMPONENT_USAGE, use); .setConsumedPower(BatteryConsumer.POWER_COMPONENT_CPU, use);
use += 5; use += 5;
} }
@@ -452,26 +452,27 @@ public class BatteryAppListPreferenceController extends AbstractPreferenceContro
for (int i = 0; i < 100; i++) { for (int i = 0; i < 100; i++) {
builder.getOrCreateUidBatteryConsumerBuilder( builder.getOrCreateUidBatteryConsumerBuilder(
new FakeUid(Process.FIRST_APPLICATION_UID + i)) new FakeUid(Process.FIRST_APPLICATION_UID + i))
.setTimeInStateMs(BatteryConsumer.TIME_COMPONENT_USAGE, 10000 + i * 1000) .setTimeInStateMs(UidBatteryConsumer.STATE_FOREGROUND, 10000 + i * 1000)
.setConsumedPower(BatteryConsumer.POWER_COMPONENT_USAGE, use); .setTimeInStateMs(UidBatteryConsumer.STATE_BACKGROUND, 20000 + i * 2000)
.setConsumedPower(BatteryConsumer.POWER_COMPONENT_CPU, use);
use += 1; use += 1;
} }
// Simulate dex2oat process. // Simulate dex2oat process.
builder.getOrCreateUidBatteryConsumerBuilder(new FakeUid(Process.FIRST_APPLICATION_UID)) builder.getOrCreateUidBatteryConsumerBuilder(new FakeUid(Process.FIRST_APPLICATION_UID))
.setTimeInStateMs(BatteryConsumer.TIME_COMPONENT_USAGE, 100000) .setUsageDurationMillis(BatteryConsumer.TIME_COMPONENT_CPU, 100000)
.setConsumedPower(BatteryConsumer.POWER_COMPONENT_USAGE, 1000.0) .setConsumedPower(BatteryConsumer.POWER_COMPONENT_CPU, 1000.0)
.setPackageWithHighestDrain("dex2oat"); .setPackageWithHighestDrain("dex2oat");
builder.getOrCreateUidBatteryConsumerBuilder(new FakeUid(Process.FIRST_APPLICATION_UID + 1)) builder.getOrCreateUidBatteryConsumerBuilder(new FakeUid(Process.FIRST_APPLICATION_UID + 1))
.setTimeInStateMs(BatteryConsumer.TIME_COMPONENT_USAGE, 100000) .setUsageDurationMillis(BatteryConsumer.TIME_COMPONENT_CPU, 100000)
.setConsumedPower(BatteryConsumer.POWER_COMPONENT_USAGE, 1000.0) .setConsumedPower(BatteryConsumer.POWER_COMPONENT_CPU, 1000.0)
.setPackageWithHighestDrain("dex2oat"); .setPackageWithHighestDrain("dex2oat");
builder.getOrCreateUidBatteryConsumerBuilder( builder.getOrCreateUidBatteryConsumerBuilder(
new FakeUid(UserHandle.getSharedAppGid(Process.LOG_UID))) new FakeUid(UserHandle.getSharedAppGid(Process.LOG_UID)))
.setTimeInStateMs(BatteryConsumer.TIME_COMPONENT_USAGE, 100000) .setUsageDurationMillis(BatteryConsumer.TIME_COMPONENT_CPU, 100000)
.setConsumedPower(BatteryConsumer.POWER_COMPONENT_USAGE, 900.0); .setConsumedPower(BatteryConsumer.POWER_COMPONENT_CPU, 900.0);
return builder.build(); 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.UserHandle;
import android.os.UserManager; import android.os.UserManager;
import android.util.Log; import android.util.Log;
import android.util.Pair;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
@@ -462,8 +461,10 @@ public class BatteryEntry {
if (mBatteryConsumer instanceof UidBatteryConsumer) { if (mBatteryConsumer instanceof UidBatteryConsumer) {
return ((UidBatteryConsumer) mBatteryConsumer).getTimeInStateMs( return ((UidBatteryConsumer) mBatteryConsumer).getTimeInStateMs(
UidBatteryConsumer.STATE_FOREGROUND); UidBatteryConsumer.STATE_FOREGROUND);
} else if (mBatteryConsumer instanceof SystemBatteryConsumer) {
return ((SystemBatteryConsumer) mBatteryConsumer).getUsageDurationMillis();
} else { } 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.ApplicationInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.PackageManager.NameNotFoundException;
import android.os.BatteryConsumer;
import android.os.Handler; import android.os.Handler;
import android.os.Process; import android.os.Process;
import android.os.SystemBatteryConsumer; import android.os.SystemBatteryConsumer;
@@ -178,8 +177,7 @@ public class BatteryEntryTest {
final BatteryEntry entry = new BatteryEntry(RuntimeEnvironment.application, mockHandler, final BatteryEntry entry = new BatteryEntry(RuntimeEnvironment.application, mockHandler,
mockUserManager, mSystemBatteryConsumer, false, null, null); mockUserManager, mSystemBatteryConsumer, false, null, null);
when(mSystemBatteryConsumer.getUsageDurationMillis(BatteryConsumer.TIME_COMPONENT_USAGE)) when(mSystemBatteryConsumer.getUsageDurationMillis()).thenReturn(100L);
.thenReturn(100L);
assertThat(entry.getTimeInForegroundMs()).isEqualTo(100L); assertThat(entry.getTimeInForegroundMs()).isEqualTo(100L);
} }
@@ -200,7 +198,7 @@ public class BatteryEntryTest {
final BatteryEntry entry = new BatteryEntry(RuntimeEnvironment.application, mockHandler, final BatteryEntry entry = new BatteryEntry(RuntimeEnvironment.application, mockHandler,
mockUserManager, mSystemBatteryConsumer, false, null, null); mockUserManager, mSystemBatteryConsumer, false, null, null);
when(mSystemBatteryConsumer.getUsageDurationMillis(BatteryConsumer.TIME_COMPONENT_USAGE)) when(mSystemBatteryConsumer.getUsageDurationMillis())
.thenReturn(100L); .thenReturn(100L);
assertThat(entry.getTimeInBackgroundMs()).isEqualTo(0); assertThat(entry.getTimeInBackgroundMs()).isEqualTo(0);