summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorAdam Lesinski <adamlesinski@google.com>2015-09-18 20:26:07 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-09-18 20:26:07 +0000
commit680553957e4ff47343334881c34de6969b2ed977 (patch)
tree7843a32acca4f93b1856c413cdf8d79dd3fc967b /services
parent1b67a6b84d133e1fdac352d0821034ceca739a71 (diff)
parent6832f39416cbe2cc9655af4eabefe39c5d272254 (diff)
downloadframeworks_base-680553957e4ff47343334881c34de6969b2ed977.zip
frameworks_base-680553957e4ff47343334881c34de6969b2ed977.tar.gz
frameworks_base-680553957e4ff47343334881c34de6969b2ed977.tar.bz2
Merge "BatteryStats: Better big-little CPU accounting" into mnc-dr-dev
Diffstat (limited to 'services')
-rw-r--r--services/core/java/com/android/server/am/BatteryStatsService.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/am/BatteryStatsService.java b/services/core/java/com/android/server/am/BatteryStatsService.java
index 335288d..62768c3 100644
--- a/services/core/java/com/android/server/am/BatteryStatsService.java
+++ b/services/core/java/com/android/server/am/BatteryStatsService.java
@@ -171,12 +171,11 @@ public final class BatteryStatsService extends IBatteryStats.Stub
public void publish(Context context) {
mContext = context;
- ServiceManager.addService(BatteryStats.SERVICE_NAME, asBinder());
- mStats.setNumSpeedSteps(new PowerProfile(mContext).getNumSpeedSteps());
mStats.setRadioScanningTimeout(mContext.getResources().getInteger(
com.android.internal.R.integer.config_radioScanningTimeout)
* 1000L);
mStats.setPowerProfile(new PowerProfile(context));
+ ServiceManager.addService(BatteryStats.SERVICE_NAME, asBinder());
}
/**