diff options
| author | Joner Lin <jonerlin@google.com> | 2022-03-23 06:13:41 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-23 06:13:41 +0000 |
| commit | c5741e1775d36bdd2dda363d06b0ace1219b0fbd (patch) | |
| tree | 17444e1a744f9904817b30e1383053d629d3a819 /service/java/com/android/server/bluetooth/BluetoothManagerService.java | |
| parent | ce789ee6cfb5dcbdc3578c8a0c5022900f24399c (diff) | |
| parent | bd01f52b72c98140e68c9238022525211f620465 (diff) | |
Merge changes from topic "Handle Shutdown Intent" am: bd01f52b72
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2032224
Change-Id: Ied705fceadc42bcb4164065e125598e82861bc5f
Diffstat (limited to 'service/java/com/android/server/bluetooth/BluetoothManagerService.java')
| -rw-r--r-- | service/java/com/android/server/bluetooth/BluetoothManagerService.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/service/java/com/android/server/bluetooth/BluetoothManagerService.java b/service/java/com/android/server/bluetooth/BluetoothManagerService.java index 8d248ea93c..bd6dfc984f 100644 --- a/service/java/com/android/server/bluetooth/BluetoothManagerService.java +++ b/service/java/com/android/server/bluetooth/BluetoothManagerService.java @@ -217,6 +217,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); @@ -479,6 +480,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; @@ -1961,6 +1963,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. |