commit 654bb79e257d555bd678828cdc62d71cdc521ff3
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Mon Apr 23 21:35:47 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 23 21:35:47 2018 +0000
tree 573adfedf9fa9ac4803406d93c342dd4f7cea103
parent f970cde42089bd39c5e41aa36bd9c31b76dae18b
parent 8b4e238882afd498afd588fd973760554442a3a4

Merge "Merge "BluetoothManagerService: Add dumpsys logs for BLE_ON -> OFF" am: 361ab2c581 am: 6dfacdcaf2" into pi-dev-plus-aosp

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

diff --git a/services/core/java/com/android/server/BluetoothManagerService.java b/services/core/java/com/android/server/BluetoothManagerService.java
index 8d10cfa..2c0e97e 100644
--- a/services/core/java/com/android/server/BluetoothManagerService.java
+++ b/services/core/java/com/android/server/BluetoothManagerService.java
@@ -285,6 +285,9 @@
                         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 @@
                 try {
                     mBluetoothLock.readLock().lock();
                     if (mBluetooth != null) {
+                        addActiveLog(BluetoothProtoEnums.ENABLE_DISABLE_REASON_APPLICATION_REQUEST,
+                                mContext.getPackageName(), false);
                         mBluetooth.onBrEdrDown();
                     }
                 } catch (RemoteException e) {