From b20910f98972c2a99ed10c733ebdf59e34069f47 Mon Sep 17 00:00:00 2001
From: jonerlin <jonerlin@google.com>
Date: Tue, 22 Mar 2022 21:57:37 +0800
Subject: [PATCH 1/2] [DO NOT MERGE] Handle SHUTDOWN Intent in
 BluetoothManagerService

Bug: 207521630
Test: reboot device and check log
Change-Id: I23f8bfb1c6d5fcf9a09c9baaa1b6555188fe0e2e
---
 .../android/server/BluetoothManagerService.java | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/services/core/java/com/android/server/BluetoothManagerService.java b/services/core/java/com/android/server/BluetoothManagerService.java
index ff24c6f16c422..fb5900e7ea85b 100644
--- a/services/core/java/com/android/server/BluetoothManagerService.java
+++ b/services/core/java/com/android/server/BluetoothManagerService.java
@@ -462,6 +462,22 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
                     Slog.i(TAG, "Device disconnected, reactivating pending flag changes");
                     onInitFlagsChanged();
                 }
+            } else if (action.equals(Intent.ACTION_SHUTDOWN)) {
+                Slog.i(TAG, "Device is shutting down.");
+                mBluetoothLock.readLock().lock();
+                try {
+                    mEnable = false;
+                    mEnableExternal = false;
+                    if (mBluetooth != null && (mState == BluetoothAdapter.STATE_BLE_ON)) {
+                        mBluetooth.onBrEdrDown(mContext.getAttributionSource());
+                    } else if (mBluetooth != null && (mState == BluetoothAdapter.STATE_ON)) {
+                        mBluetooth.disable(mContext.getAttributionSource());
+                    }
+                } catch (RemoteException e) {
+                    Slog.e(TAG, "Unable to shutdown Bluetooth", e);
+                } finally {
+                    mBluetoothLock.readLock().unlock();
+                }
             }
         }
     };
@@ -515,6 +531,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
         filter.addAction(Intent.ACTION_SETTING_RESTORED);
         filter.addAction(BluetoothA2dp.ACTION_CONNECTION_STATE_CHANGED);
         filter.addAction(BluetoothHearingAid.ACTION_CONNECTION_STATE_CHANGED);
+        filter.addAction(Intent.ACTION_SHUTDOWN);
         filter.setPriority(IntentFilter.SYSTEM_HIGH_PRIORITY);
         mContext.registerReceiver(mReceiver, filter);
 

From 68ce540e60cf3721472184348f7504b570018661 Mon Sep 17 00:00:00 2001
From: jonerlin <jonerlin@google.com>
Date: Wed, 23 Mar 2022 18:43:32 +0800
Subject: [PATCH 2/2] [DO NOT MERGE] Do not allow Bluetooth enabling during
 device shutting down

Bug: 207521630
Test: reboot device in BLE_ON state, check log
Change-Id: I5e68ecd7816a6e636ebb9cef070dd32fbd9bf3c4
---
 .../java/com/android/server/BluetoothManagerService.java   | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/services/core/java/com/android/server/BluetoothManagerService.java b/services/core/java/com/android/server/BluetoothManagerService.java
index fb5900e7ea85b..7ff693cdaa8dd 100644
--- a/services/core/java/com/android/server/BluetoothManagerService.java
+++ b/services/core/java/com/android/server/BluetoothManagerService.java
@@ -193,6 +193,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
     // used inside handler thread
     private boolean mQuietEnable = false;
     private boolean mEnable;
+    private boolean mShutdownInProgress = false;
 
     private static CharSequence timeToLog(long timestamp) {
         return android.text.format.DateFormat.format("MM-dd HH:mm:ss", timestamp);
@@ -464,6 +465,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
                 }
             } else if (action.equals(Intent.ACTION_SHUTDOWN)) {
                 Slog.i(TAG, "Device is shutting down.");
+                mShutdownInProgress = true;
                 mBluetoothLock.readLock().lock();
                 try {
                     mEnable = false;
@@ -1867,6 +1869,11 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
                 case MESSAGE_ENABLE:
                     int quietEnable = msg.arg1;
                     int isBle  = msg.arg2;
+                    if (mShutdownInProgress) {
+                        Slog.i(TAG, "Skip Bluetooth Enable in device shutdown process");
+                        break;
+                    }
+
                     if (mHandler.hasMessages(MESSAGE_HANDLE_DISABLE_DELAYED)
                             || mHandler.hasMessages(MESSAGE_HANDLE_ENABLE_DELAYED)) {
                         // We are handling enable or disable right now, wait for it.