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

Add new constructor to create BatteryHistEntry from interpolation

Browse Source 
https://matthew-brett.github.io/teaching/linear_interpolation.html

Bug: 184807417
Test: make SettingsRoboTests
Change-Id: I6dbdb3db8243e40bc54bde3aab7157fda2719de9
This commit is contained in:
ykhung
2021-05-05 14:03:02 +08:00
parent 973212adf7
commit 9db43b8f76
2 changed files with 241 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
src/com/android/settings/fuelgauge/BatteryHistEntry.java
View File

@@ -114,6 +114,35 @@ public class BatteryHistEntry {
mBatteryHealth = getInteger(cursor, KEY_BATTERY_HEALTH);
}
private BatteryHistEntry(
BatteryHistEntry fromEntry,
long bootTimestamp,
long timestamp,
double totalPower,
double consumePower,
long foregroundUsageTimeInMs,
long backgroundUsageTimeInMs,
int batteryLevel) {
mUid = fromEntry.mUid;
mUserId = fromEntry.mUserId;
mAppLabel = fromEntry.mAppLabel;
mPackageName = fromEntry.mPackageName;
mIsHidden = fromEntry.mIsHidden;
mBootTimestamp = bootTimestamp;
mTimestamp = timestamp;
mZoneId = fromEntry.mZoneId;
mTotalPower = totalPower;
mConsumePower = consumePower;
mPercentOfTotal = fromEntry.mPercentOfTotal;
mForegroundUsageTimeInMs = foregroundUsageTimeInMs;
mBackgroundUsageTimeInMs = backgroundUsageTimeInMs;
mDrainType = fromEntry.mDrainType;
mConsumerType = fromEntry.mConsumerType;
mBatteryLevel = batteryLevel;
mBatteryStatus = fromEntry.mBatteryStatus;
mBatteryHealth = fromEntry.mBatteryHealth;
}
/** Whether this {@link BatteryHistEntry} is valid or not? */
public boolean isValidEntry() {
return mIsValidEntry;
@@ -257,4 +286,50 @@ public class BatteryHistEntry {
mIsValidEntry = false;
return false;
}
/** Creates new {@link BatteryHistEntry} from interpolation. */
public static BatteryHistEntry interpolate(
long slotTimestamp,
long upperTimestamp,
double ratio,
BatteryHistEntry lowerHistEntry,
BatteryHistEntry upperHistEntry) {
final double totalPower = interpolate(
lowerHistEntry == null ? 0 : lowerHistEntry.mTotalPower,
upperHistEntry.mTotalPower,
ratio);
final double consumePower = interpolate(
lowerHistEntry == null ? 0 : lowerHistEntry.mConsumePower,
upperHistEntry.mConsumePower,
ratio);
final double foregroundUsageTimeInMs = interpolate(
lowerHistEntry == null ? 0 : lowerHistEntry.mForegroundUsageTimeInMs,
upperHistEntry.mForegroundUsageTimeInMs,
ratio);
final double backgroundUsageTimeInMs = interpolate(
lowerHistEntry == null ? 0 : lowerHistEntry.mBackgroundUsageTimeInMs,
upperHistEntry.mBackgroundUsageTimeInMs,
ratio);
final double batteryLevel =
lowerHistEntry == null
? upperHistEntry.mBatteryLevel
: interpolate(
lowerHistEntry.mBatteryLevel,
upperHistEntry.mBatteryLevel,
ratio);
return new BatteryHistEntry(
upperHistEntry,
/*bootTimestamp=*/ upperHistEntry.mBootTimestamp
- (upperTimestamp - slotTimestamp),
/*timestamp=*/ slotTimestamp,
totalPower,
consumePower,
Math.round(foregroundUsageTimeInMs),
Math.round(backgroundUsageTimeInMs),
(int) Math.round(batteryLevel));
}
private static double interpolate(double v1, double v2, double ratio) {
return v1 + ratio * (v2 - v1);
}
}