summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2018-09-27 14:59:27 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2018-09-27 14:59:27 +0000
commit1d65ea4edd0ca4acbb423f1638f72b12041e6695 (patch)
tree7ca514dc302fb2628f7b151c6eb00ff87dc81644
parent8426a06516635fc7ba943af78e1b64efa4215aa5 (diff)
parentc2d02b522cd7efea659a3ff784040f84b8cdbc18 (diff)
Merge "Use the background thread instead ActivityManager to update CPU stats."
-rw-r--r--core/java/com/android/internal/os/BatteryStatsImpl.java3
-rw-r--r--services/core/java/com/android/server/am/ActivityManagerService.java3
2 files changed, 5 insertions, 1 deletions
diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java
index 31f13c33c167..33b9ff7cee4f 100644
--- a/core/java/com/android/internal/os/BatteryStatsImpl.java
+++ b/core/java/com/android/internal/os/BatteryStatsImpl.java
@@ -337,6 +337,9 @@ public class BatteryStatsImpl extends BatteryStats {
private final PlatformIdleStateCallback mPlatformIdleStateCallback;
+ /**
+ * This handler is running on {@link BackgroundThread}.
+ */
final class MyHandler extends Handler {
public MyHandler(Looper looper) {
super(looper, null, true);
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 6e90d5b5c21b..692f9cfaa833 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -2381,7 +2381,8 @@ public class ActivityManagerService extends IActivityManager.Stub
final File systemDir = SystemServiceManager.ensureSystemDir();
// TODO: Move creation of battery stats service outside of activity manager service.
- mBatteryStatsService = new BatteryStatsService(systemContext, systemDir, mHandler);
+ mBatteryStatsService = new BatteryStatsService(systemContext, systemDir,
+ BackgroundThread.get().getHandler());
mBatteryStatsService.getActiveStatistics().readLocked();
mBatteryStatsService.scheduleWriteToDisk();
mOnBattery = DEBUG_POWER ? true