Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Track background sensor usage

Browse Source 
Keep an additional counter for background access
of sensors. Increment the count when sensor is
accessed while process is in the background state.

Bug: 33553631
Test: runtest -x frameworks/base/core/tests/coretests/src/com/android/internal/os/BatteryStatsSensorTest.java
Change-Id: I87d7dbdaf4c34aa9dd9c7e13134d8f5f759f4e2b
This commit is contained in:
Amith Yamasani
2016-12-06 12:46:59 -08:00
parent 9bab1c4dd5
commit ab9ad195d1
5 changed files with 141 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
core/java/android/os/BatteryStats.java
View File

@@ -39,6 +39,7 @@ import android.util.SparseArray;
import android.util.SparseIntArray;
import android.util.TimeUtils;
import android.view.Display;
import com.android.internal.os.BatterySipper;
import com.android.internal.os.BatteryStatsHelper;
@@ -181,6 +182,8 @@ public abstract class BatteryStats implements Parcelable {
*
* New in version 19:
* - Wakelock data (wl) gets current and max times.
* New in version 20:
* - Sensor gets a background counter.
*/
static final String CHECKIN_VERSION = "20";
@@ -600,10 +603,13 @@ public abstract class BatteryStats implements Parcelable {
*/
// Magic sensor number for the GPS.
public static final int GPS = -10000;
public abstract int getHandle();
public abstract Timer getSensorTime();
/** Returns a counter for usage count when in the background. */
public abstract Counter getSensorBgCount();
}
public class Pid {
@@ -3318,13 +3324,16 @@ public abstract class BatteryStats implements Parcelable {
final Uid.Sensor se = sensors.valueAt(ise);
final int sensorNumber = sensors.keyAt(ise);
final Timer timer = se.getSensorTime();
final Counter bgCounter = se.getSensorBgCount();
if (timer != null) {
// Convert from microseconds to milliseconds with rounding
final long totalTime = (timer.getTotalTimeLocked(rawRealtime, which) + 500)
/ 1000;
final int count = timer.getCountLocked(which);
final int bgCount = bgCounter != null ? bgCounter.getCountLocked(which) : 0;
if (totalTime != 0) {
dumpLine(pw, uid, category, SENSOR_DATA, sensorNumber, totalTime, count);
dumpLine(pw, uid, category, SENSOR_DATA, sensorNumber, totalTime, count,
bgCount);
}
}
}
@@ -4493,17 +4502,25 @@ public abstract class BatteryStats implements Parcelable {
sb.append(": ");
final Timer timer = se.getSensorTime();
final Counter bgCounter = se.getSensorBgCount();
if (timer != null) {
// Convert from microseconds to milliseconds with rounding
final long totalTime = (timer.getTotalTimeLocked(
rawRealtime, which) + 500) / 1000;
final int count = timer.getCountLocked(which);
final int bgCount = bgCounter != null ? bgCounter.getCountLocked(which) : 0;
//timer.logState();
if (totalTime != 0) {
formatTimeMs(sb, totalTime);
sb.append("realtime (");
sb.append(count);
sb.append(" times)");
sb.append(" times");
if (bgCount > 0) {
sb.append(", ");
sb.append(bgCount);
sb.append(" bg");
}
sb.append(")");
} else {
sb.append("(not used)");
}