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

Commit 1f7fa067 authored by Myles Watson's avatar Myles Watson
Browse files

ShutdownThread: Don't wait for Bluetooth 

Bluetooth doesn't need to be shut down cleanly; shutting it down just
slows down the shutdown process.

Bug: 70855323
Test: Boot, shut down, boot, shut down.
Change-Id: Ic2ed89dd618806adc6646066ab0956dea4a94d8e
parent 551d9aa6

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

+5 −44
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ import android.app.AlertDialog; 
import android.app.Dialog;

import android.app.IActivityManager;

import android.app.ProgressDialog;

import android.bluetooth.BluetoothAdapter;

import android.bluetooth.IBluetoothManager;

import android.content.BroadcastReceiver;

import android.content.Context;

import android.content.DialogInterface;
@@ -114,7 +112,6 @@ public final class ShutdownThread extends Thread { 
    private static String METRIC_AM = "shutdown_activity_manager";

    private static String METRIC_PM = "shutdown_package_manager";

    private static String METRIC_RADIOS = "shutdown_radios";

    private static String METRIC_BT = "shutdown_bt";

    private static String METRIC_RADIO = "shutdown_radio";



    private final Object mActionDoneSync = new Object();
@@ -408,7 +405,7 @@ public final class ShutdownThread extends Thread { 


    /**

     * Makes sure we handle the shutdown gracefully.

     * Shuts off power regardless of radio and bluetooth state if the alloted time has passed.

     * Shuts off power regardless of radio state if the allotted time has passed.

     */

    public void run() {

        TimingsTraceLog shutdownTimingLog = newTimingsLog();
@@ -572,27 +569,10 @@ public final class ShutdownThread extends Thread { 
        Thread t = new Thread() {

            public void run() {

                TimingsTraceLog shutdownTimingsTraceLog = newTimingsLog();

                boolean bluetoothReadyForShutdown;

                boolean radioOff;



                final ITelephony phone =

                        ITelephony.Stub.asInterface(ServiceManager.checkService("phone"));

                final IBluetoothManager bluetooth =

                        IBluetoothManager.Stub.asInterface(ServiceManager.checkService(

                                BluetoothAdapter.BLUETOOTH_MANAGER_SERVICE));



                try {

                    bluetoothReadyForShutdown = bluetooth == null ||

                            bluetooth.getState() == BluetoothAdapter.STATE_OFF;

                    if (!bluetoothReadyForShutdown) {

                        Log.w(TAG, "Disabling Bluetooth...");

                        metricStarted(METRIC_BT);

                        bluetooth.disable(mContext.getPackageName(), false);  // disable but don't persist new state

                    }

                } catch (RemoteException ex) {

                    Log.e(TAG, "RemoteException during bluetooth shutdown", ex);

                    bluetoothReadyForShutdown = true;

                }



                try {

                    radioOff = phone == null || !phone.needMobileRadioShutdown();
@@ -606,7 +586,7 @@ public final class ShutdownThread extends Thread { 
                    radioOff = true;

                }



                Log.i(TAG, "Waiting for Bluetooth and Radio...");

                Log.i(TAG, "Waiting for Radio...");



                long delay = endTime - SystemClock.elapsedRealtime();

                while (delay > 0) {
@@ -617,25 +597,6 @@ public final class ShutdownThread extends Thread { 
                        sInstance.setRebootProgress(status, null);

                    }



                    if (!bluetoothReadyForShutdown) {

                        try {

                          // BLE only mode can happen when BT is turned off

                          // We will continue shutting down in such case

                          bluetoothReadyForShutdown =

                                  bluetooth.getState() == BluetoothAdapter.STATE_OFF ||

                                  bluetooth.getState() == BluetoothAdapter.STATE_BLE_TURNING_OFF ||

                                  bluetooth.getState() == BluetoothAdapter.STATE_BLE_ON;

                        } catch (RemoteException ex) {

                            Log.e(TAG, "RemoteException during bluetooth shutdown", ex);

                            bluetoothReadyForShutdown = true;

                        }

                        if (bluetoothReadyForShutdown) {

                            Log.i(TAG, "Bluetooth turned off.");

                            metricEnded(METRIC_BT);

                            shutdownTimingsTraceLog

                                    .logDuration("ShutdownBt", TRON_METRICS.get(METRIC_BT));

                        }

                    }

                    if (!radioOff) {

                        try {

                            radioOff = !phone.needMobileRadioShutdown();
@@ -651,8 +612,8 @@ public final class ShutdownThread extends Thread { 
                        }

                    }



                    if (radioOff && bluetoothReadyForShutdown) {

                        Log.i(TAG, "Radio and Bluetooth shutdown complete.");

                    if (radioOff) {

                        Log.i(TAG, "Radio shutdown complete.");

                        done[0] = true;

                        break;

                    }
@@ -668,7 +629,7 @@ public final class ShutdownThread extends Thread { 
        } catch (InterruptedException ex) {

        }

        if (!done[0]) {

            Log.w(TAG, "Timed out waiting for Radio and Bluetooth shutdown.");

            Log.w(TAG, "Timed out waiting for Radio shutdown.");

        }

    }