Merge changes I474cd019,I8d87c1da,I90ebad48 into sc-dev
* changes: Make CpuPowerCalculator's Estimators available to com.android.internal Implement EnergyConsumer type to ids map for targeted querying Add cpu proc file read throttling enabling/disabling
Showing
- core/java/com/android/internal/os/BatteryStatsImpl.java 8 additions, 8 deletionscore/java/com/android/internal/os/BatteryStatsImpl.java
- core/java/com/android/internal/os/CpuPowerCalculator.java 40 additions, 5 deletionscore/java/com/android/internal/os/CpuPowerCalculator.java
- core/java/com/android/internal/os/KernelCpuUidTimeReader.java 11 additions, 2 deletions.../java/com/android/internal/os/KernelCpuUidTimeReader.java
- core/tests/coretests/src/com/android/internal/os/KernelCpuUidUserSysTimeReaderTest.java 38 additions, 11 deletions...ndroid/internal/os/KernelCpuUidUserSysTimeReaderTest.java
- services/core/java/com/android/server/am/BatteryExternalStatsWorker.java 81 additions, 35 deletions...ava/com/android/server/am/BatteryExternalStatsWorker.java
- services/tests/servicestests/src/com/android/server/am/BatteryExternalStatsWorkerTest.java 87 additions, 7 deletions...com/android/server/am/BatteryExternalStatsWorkerTest.java
Loading
Please register or sign in to comment