Merge "Fix Watchdog HeartbeatHandler to run on correct thread"

import android.os.BatteryManager;

import android.os.Debug;

import android.os.Handler;

import android.os.Looper;

import android.os.Message;

import android.os.Process;

import android.os.ServiceManager;

     * Used for scheduling monitor callbacks and checking memory usage.

     */

    final class HeartbeatHandler extends Handler {

        HeartbeatHandler(Looper looper) {

            super(looper);

        }

        @Override

        public void handleMessage(Message msg) {

            switch (msg.what) {

    private Watchdog() {

        super("watchdog");

        mHandler = new HeartbeatHandler();

        // Explicitly bind the HeartbeatHandler to run on the ServerThread, so

        // that it can't get accidentally bound to another thread.

        mHandler = new HeartbeatHandler(Looper.getMainLooper());

    }

    public void init(Context context, BatteryService battery,