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

Commit 614636e9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Change the thread for handling shutdown of PowerManagerService." into oc-dev

parents c6700cac 64c820d3

services/core/java/com/android/server/power/PowerManagerService.java

+3 −2
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ import com.android.server.LockGuard; 
import com.android.server.RescueParty;

import com.android.server.ServiceThread;

import com.android.server.SystemService;

import com.android.server.UiThread;

import com.android.server.Watchdog;

import com.android.server.am.BatteryStatsService;

import com.android.server.lights.Light;
@@ -2729,9 +2730,9 @@ public final class PowerManagerService extends SystemService 
        };



        // ShutdownThread must run on a looper capable of displaying the UI.

        Message msg = Message.obtain(mHandler, runnable);

        Message msg = Message.obtain(UiThread.getHandler(), runnable);

        msg.setAsynchronous(true);

        mHandler.sendMessage(msg);

        UiThread.getHandler().sendMessage(msg);



        // PowerManager.reboot() is documented not to return so just wait for the inevitable.

        if (wait) {