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

Commit 11ddc403 authored by Hansong Zhang's avatar Hansong Zhang Committed by android-build-merger
Browse files

Merge "Merge "BluetoothManagerService: Add dumpsys logs for BLE_ON -> OFF" am:... 

Merge "Merge "BluetoothManagerService: Add dumpsys logs for BLE_ON -> OFF" am: 361ab2c5 am: 6dfacdca" into pi-dev-plus-aosp
am: 654bb79e

Change-Id: Ieb697253ea88dc965bb6ee097dcf56204cc529a3
parents b63a513a 654bb79e

services/core/java/com/android/server/BluetoothManagerService.java

+5 −0
Original line number Diff line number Diff line
@@ -285,6 +285,9 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
                        try {

                            mBluetoothLock.readLock().lock();

                            if (mBluetooth != null) {

                                addActiveLog(

                                        BluetoothProtoEnums.ENABLE_DISABLE_REASON_AIRPLANE_MODE,

                                        mContext.getPackageName(), false);

                                mBluetooth.onBrEdrDown();

                                mEnable = false;

                                mEnableExternal = false;
@@ -677,6 +680,8 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
                try {

                    mBluetoothLock.readLock().lock();

                    if (mBluetooth != null) {

                        addActiveLog(BluetoothProtoEnums.ENABLE_DISABLE_REASON_APPLICATION_REQUEST,

                                mContext.getPackageName(), false);

                        mBluetooth.onBrEdrDown();

                    }

                } catch (RemoteException e) {