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

Commit c1d74f61 authored by jonerlin's avatar jonerlin
Browse files

Handle SHUTDOWN Intent in BluetoothManagerService 

Tag: #feature
Bug: 207521630
Test: reboot device and check log
Ignore-AOSP-First: Conflict with internal
Change-Id: Ib30a5000ff1be24c276e673d096f67acb64136d6
parent dcdc839a

service/java/com/android/server/bluetooth/BluetoothManagerService.java

+17 −0
Original line number Diff line number Diff line
@@ -484,6 +484,22 @@ public class BluetoothManagerService extends IBluetoothManager.Stub { 
                    Log.i(TAG, "Device disconnected, reactivating pending flag changes");

                    onInitFlagsChanged();

                }

            } else if (action.equals(Intent.ACTION_SHUTDOWN)) {

                Log.i(TAG, "Device is shutting down.");

                mBluetoothLock.readLock().lock();

                try {

                    mEnable = false;

                    mEnableExternal = false;

                    if (mBluetooth != null && (mState == BluetoothAdapter.STATE_BLE_ON)) {

                        synchronousOnBrEdrDown(mContext.getAttributionSource());

                    } else if (mBluetooth != null && (mState == BluetoothAdapter.STATE_ON)) {

                        synchronousDisable(mContext.getAttributionSource());

                    }

                } catch (RemoteException | TimeoutException e) {

                    Log.e(TAG, "Unable to shutdown Bluetooth", e);

                } finally {

                    mBluetoothLock.readLock().unlock();

                }

            }

        }

    };
@@ -540,6 +556,7 @@ public 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);