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

Merge "Move batterystats stats collection to its own thread" into nyc-dev

Browse Source
This commit is contained in:
Adam Lesinski
2016-04-20 01:18:48 +00:00
committed by Android (Google) Code Review
parent ecdc5c4448 20b84dfa59
commit b7a92e6009
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/am/BatteryStatsService.java
View File

@@ -58,8 +58,8 @@ import com.android.internal.app.IBatteryStats;
import com.android.internal.os.BatteryStatsHelper; import com.android.internal.os.BatteryStatsHelper;
import com.android.internal.os.BatteryStatsImpl; import com.android.internal.os.BatteryStatsImpl;
import com.android.internal.os.PowerProfile; import com.android.internal.os.PowerProfile;
import com.android.server.FgThread;
import com.android.server.LocalServices; import com.android.server.LocalServices;
import com.android.server.ServiceThread;
import java.io.File; import java.io.File;
import java.io.FileDescriptor; import java.io.FileDescriptor;
@@ -176,7 +176,10 @@ public final class BatteryStatsService extends IBatteryStats.Stub
BatteryStatsService(File systemDir, Handler handler) { BatteryStatsService(File systemDir, Handler handler) {
// Our handler here will be accessing the disk, use a different thread than // Our handler here will be accessing the disk, use a different thread than
// what the ActivityManagerService gave us (no I/O on that one!). // what the ActivityManagerService gave us (no I/O on that one!).
mHandler = new BatteryStatsHandler(FgThread.getHandler().getLooper()); final ServiceThread thread = new ServiceThread("batterystats-sync",
Process.THREAD_PRIORITY_DEFAULT, true);
thread.start();
mHandler = new BatteryStatsHandler(thread.getLooper());
// BatteryStatsImpl expects the ActivityManagerService handler, so pass that one through. // BatteryStatsImpl expects the ActivityManagerService handler, so pass that one through.
mStats = new BatteryStatsImpl(systemDir, handler, mHandler); mStats = new BatteryStatsImpl(systemDir, handler, mHandler);
@@ -209,6 +212,9 @@ public final class BatteryStatsService extends IBatteryStats.Stub
synchronized (mStats) { synchronized (mStats) {
mStats.shutdownLocked(); mStats.shutdownLocked();
} }
// Shutdown the thread we made.
mHandler.getLooper().quit();
} }
public static IBatteryStats getService() { public static IBatteryStats getService() {