Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4deaf893 authored by Wink Saville's avatar Wink Saville Committed by Android Git Automerger
Browse files

am 6837f4a4: am e4679750: Merge "Fix Watchdog HeartbeatHandler to run on correct thread"

* commit '6837f4a4':
  Fix Watchdog HeartbeatHandler to run on correct thread
parents 9eac5269 6837f4a4
Loading
Loading
Loading
Loading
+8 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.content.IntentFilter;
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;
@@ -114,6 +115,10 @@ public class Watchdog extends Thread {
     * 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) {
@@ -183,7 +188,9 @@ public class Watchdog extends Thread {

    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,