Merge "Revert "[Bluetooth] Convert BluetoothController logs to log buffer"" into tm-qpr-dev

packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothCallback.java

@@ -16,20 +16,6 @@
 
 package com.android.settingslib.bluetooth;
 
-import static android.bluetooth.BluetoothAdapter.STATE_CONNECTED;
-import static android.bluetooth.BluetoothAdapter.STATE_CONNECTING;
-import static android.bluetooth.BluetoothAdapter.STATE_DISCONNECTED;
-import static android.bluetooth.BluetoothAdapter.STATE_DISCONNECTING;
-import static android.bluetooth.BluetoothAdapter.STATE_OFF;
-import static android.bluetooth.BluetoothAdapter.STATE_ON;
-import static android.bluetooth.BluetoothAdapter.STATE_TURNING_OFF;
-import static android.bluetooth.BluetoothAdapter.STATE_TURNING_ON;
-
-import android.annotation.IntDef;
-import android.annotation.Nullable;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 
 /**
  * BluetoothCallback provides a callback interface for the settings
@@ -47,7 +33,7 @@ public interface BluetoothCallback {
      * {@link android.bluetooth.BluetoothAdapter#STATE_ON},
      * {@link android.bluetooth.BluetoothAdapter#STATE_TURNING_OFF}.
      */
-    default void onBluetoothStateChanged(@AdapterState int bluetoothState) {}
+    default void onBluetoothStateChanged(int bluetoothState) {}
 
     /**
      * It will be called when the local Bluetooth adapter has started
@@ -103,9 +89,7 @@ public interface BluetoothCallback {
      * {@link android.bluetooth.BluetoothAdapter#STATE_CONNECTED},
      * {@link android.bluetooth.BluetoothAdapter#STATE_DISCONNECTING}.
      */
-    default void onConnectionStateChanged(
+    default void onConnectionStateChanged(CachedBluetoothDevice cachedDevice, int state) {}
-            @Nullable CachedBluetoothDevice cachedDevice,
-            @ConnectionState int state) {}
 
     /**
      * It will be called when device been set as active for {@code bluetoothProfile}
@@ -140,10 +124,8 @@ public interface BluetoothCallback {
      * {@link android.bluetooth.BluetoothProfile#STATE_DISCONNECTING}.
      * @param bluetoothProfile the BluetoothProfile id.
      */
-    default void onProfileConnectionStateChanged(
+    default void onProfileConnectionStateChanged(CachedBluetoothDevice cachedDevice,
-            CachedBluetoothDevice cachedDevice,
+            int state, int bluetoothProfile) {
-            @ConnectionState int state,
-            int bluetoothProfile) {
     }
 
     /**
@@ -158,22 +140,4 @@ public interface BluetoothCallback {
      */
     default void onAclConnectionStateChanged(CachedBluetoothDevice cachedDevice, int state) {
     }
-
-    @Retention(RetentionPolicy.SOURCE)
-    @IntDef(prefix = { "STATE_" }, value = {
-            STATE_DISCONNECTED,
-            STATE_CONNECTING,
-            STATE_CONNECTED,
-            STATE_DISCONNECTING,
-    })
-    @interface ConnectionState {}
-
-    @IntDef(prefix = { "STATE_" }, value = {
-            STATE_OFF,
-            STATE_TURNING_ON,
-            STATE_ON,
-            STATE_TURNING_OFF,
-    })
-    @Retention(RetentionPolicy.SOURCE)
-    @interface AdapterState {}
 }

packages/SystemUI/src/com/android/systemui/bluetooth/BluetoothLogger.kt

@@ -1,102 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.systemui.bluetooth
-
-import com.android.systemui.dagger.SysUISingleton
-import com.android.systemui.log.LogBuffer
-import com.android.systemui.log.LogLevel
-import com.android.systemui.log.dagger.BluetoothLog
-import javax.inject.Inject
-
-/** Helper class for logging bluetooth events. */
-@SysUISingleton
-class BluetoothLogger @Inject constructor(@BluetoothLog private val logBuffer: LogBuffer) {
-    fun logActiveDeviceChanged(address: String, profileId: Int) =
-        logBuffer.log(
-            TAG,
-            LogLevel.DEBUG,
-            {
-                str1 = address
-                int1 = profileId
-            },
-            { "ActiveDeviceChanged. address=$str1 profileId=$int1" }
-        )
-
-    fun logDeviceConnectionStateChanged(address: String?, state: String) =
-        logBuffer.log(
-            TAG,
-            LogLevel.DEBUG,
-            {
-                str1 = address
-                str2 = state
-            },
-            { "DeviceConnectionStateChanged. address=$str1 state=$str2" }
-        )
-
-    fun logAclConnectionStateChanged(address: String, state: String) =
-        logBuffer.log(
-            TAG,
-            LogLevel.DEBUG,
-            {
-                str1 = address
-                str2 = state
-            },
-            { "AclConnectionStateChanged. address=$str1 state=$str2" }
-        )
-
-    fun logProfileConnectionStateChanged(address: String, state: String, profileId: Int) =
-        logBuffer.log(
-            TAG,
-            LogLevel.DEBUG,
-            {
-                str1 = address
-                str2 = state
-                int1 = profileId
-            },
-            { "ProfileConnectionStateChanged. address=$str1 state=$str2 profileId=$int1" }
-        )
-
-    fun logStateChange(state: String) =
-        logBuffer.log(
-            TAG,
-            LogLevel.DEBUG,
-            { str1 = state },
-            { "BluetoothStateChanged. state=$str1" }
-        )
-
-    fun logBondStateChange(address: String, state: Int) =
-        logBuffer.log(
-            TAG,
-            LogLevel.DEBUG,
-            {
-                str1 = address
-                int1 = state
-            },
-            { "DeviceBondStateChanged. address=$str1 state=$int1" }
-        )
-
-    fun logDeviceAdded(address: String) =
-        logBuffer.log(TAG, LogLevel.DEBUG, { str1 = address }, { "DeviceAdded. address=$str1" })
-
-    fun logDeviceDeleted(address: String) =
-        logBuffer.log(TAG, LogLevel.DEBUG, { str1 = address }, { "DeviceDeleted. address=$str1" })
-
-    fun logDeviceAttributesChanged() =
-        logBuffer.log(TAG, LogLevel.DEBUG, {}, { "DeviceAttributesChanged." })
-}
-
-private const val TAG = "BluetoothLog"

packages/SystemUI/src/com/android/systemui/keyboard/KeyboardUI.java

@@ -601,7 +601,7 @@ public class KeyboardUI extends CoreStartable implements InputManager.OnTabletMo
 
     private final class BluetoothCallbackHandler implements BluetoothCallback {
         @Override
-        public void onBluetoothStateChanged(@BluetoothCallback.AdapterState int bluetoothState) {
+        public void onBluetoothStateChanged(int bluetoothState) {
             mHandler.obtainMessage(MSG_ON_BLUETOOTH_STATE_CHANGED,
                     bluetoothState, 0).sendToTarget();
         }

packages/SystemUI/src/com/android/systemui/log/dagger/BluetoothLog.kt

@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.systemui.log.dagger
-
-import javax.inject.Qualifier
-
-/** A [com.android.systemui.log.LogBuffer] for bluetooth. */
-@Qualifier @MustBeDocumented @Retention(AnnotationRetention.RUNTIME) annotation class BluetoothLog

packages/SystemUI/src/com/android/systemui/log/dagger/KeyguardUpdateMonitorLog.kt

@@ -1,9 +1,4 @@
 package com.android.systemui.log.dagger
 
-import javax.inject.Qualifier
-
 /** A [com.android.systemui.log.LogBuffer] for KeyguardUpdateMonitor. */
-@Qualifier
-@MustBeDocumented
-@Retention(AnnotationRetention.RUNTIME)
 annotation class KeyguardUpdateMonitorLog

packages/SystemUI/src/com/android/systemui/log/dagger/LogModule.java

@@ -305,14 +305,4 @@ public class LogModule {
     public static LogBuffer provideKeyguardUpdateMonitorLogBuffer(LogBufferFactory factory) {
         return factory.create("KeyguardUpdateMonitorLog", 200);
     }
-
-    /**
-     * Provides a {@link LogBuffer} for bluetooth-related logs.
-     */
-    @Provides
-    @SysUISingleton
-    @BluetoothLog
-    public static LogBuffer providerBluetoothLogBuffer(LogBufferFactory factory) {
-        return factory.create("BluetoothLog", 50);
-    }
 }

packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothControllerImpl.java

@@ -27,6 +27,7 @@ import android.os.Looper;
 import android.os.Message;
 import android.os.UserHandle;
 import android.os.UserManager;
+import android.util.Log;
 
 import androidx.annotation.NonNull;
 
@@ -36,7 +37,6 @@ import com.android.settingslib.bluetooth.CachedBluetoothDevice;
 import com.android.settingslib.bluetooth.LocalBluetoothManager;
 import com.android.settingslib.bluetooth.LocalBluetoothProfile;
 import com.android.settingslib.bluetooth.LocalBluetoothProfileManager;
-import com.android.systemui.bluetooth.BluetoothLogger;
 import com.android.systemui.dagger.SysUISingleton;
 import com.android.systemui.dagger.qualifiers.Background;
 import com.android.systemui.dagger.qualifiers.Main;
@@ -57,9 +57,9 @@ import javax.inject.Inject;
 public class BluetoothControllerImpl implements BluetoothController, BluetoothCallback,
         CachedBluetoothDevice.Callback, LocalBluetoothProfileManager.ServiceListener {
     private static final String TAG = "BluetoothController";
+    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
 
     private final DumpManager mDumpManager;
-    private final BluetoothLogger mLogger;
     private final LocalBluetoothManager mLocalBluetoothManager;
     private final UserManager mUserManager;
     private final int mCurrentUser;
@@ -70,7 +70,6 @@ public class BluetoothControllerImpl implements BluetoothController, BluetoothCa
     private final List<CachedBluetoothDevice> mConnectedDevices = new ArrayList<>();
 
     private boolean mEnabled;
-    @ConnectionState
     private int mConnectionState = BluetoothAdapter.STATE_DISCONNECTED;
     private boolean mAudioProfileOnly;
     private boolean mIsActive;
@@ -84,12 +83,10 @@ public class BluetoothControllerImpl implements BluetoothController, BluetoothCa
     public BluetoothControllerImpl(
             Context context,
             DumpManager dumpManager,
-            BluetoothLogger logger,
             @Background Looper bgLooper,
             @Main Looper mainLooper,
             @Nullable LocalBluetoothManager localBluetoothManager) {
         mDumpManager = dumpManager;
-        mLogger = logger;
         mLocalBluetoothManager = localBluetoothManager;
         mBgHandler = new Handler(bgLooper);
         mHandler = new H(mainLooper);
@@ -119,7 +116,7 @@ public class BluetoothControllerImpl implements BluetoothController, BluetoothCa
             return;
         }
         pw.print("  mEnabled="); pw.println(mEnabled);
-        pw.print("  mConnectionState="); pw.println(connectionStateToString(mConnectionState));
+        pw.print("  mConnectionState="); pw.println(stateToString(mConnectionState));
         pw.print("  mAudioProfileOnly="); pw.println(mAudioProfileOnly);
         pw.print("  mIsActive="); pw.println(mIsActive);
         pw.print("  mConnectedDevices="); pw.println(getConnectedDevices());
@@ -130,7 +127,7 @@ public class BluetoothControllerImpl implements BluetoothController, BluetoothCa
         }
     }
 
-    private static String connectionStateToString(@ConnectionState int state) {
+    private static String stateToString(int state) {
         switch (state) {
             case BluetoothAdapter.STATE_CONNECTED:
                 return "CONNECTED";
@@ -323,8 +320,8 @@ public class BluetoothControllerImpl implements BluetoothController, BluetoothCa
     }
 
     @Override
-    public void onBluetoothStateChanged(@AdapterState int bluetoothState) {
+    public void onBluetoothStateChanged(int bluetoothState) {
-        mLogger.logStateChange(BluetoothAdapter.nameForState(bluetoothState));
+        if (DEBUG) Log.d(TAG, "BluetoothStateChanged=" + stateToString(bluetoothState));
         mEnabled = bluetoothState == BluetoothAdapter.STATE_ON
                 || bluetoothState == BluetoothAdapter.STATE_TURNING_ON;
         mState = bluetoothState;
@@ -334,7 +331,7 @@ public class BluetoothControllerImpl implements BluetoothController, BluetoothCa
 
     @Override
     public void onDeviceAdded(CachedBluetoothDevice cachedDevice) {
-        mLogger.logDeviceAdded(cachedDevice.getAddress());
+        if (DEBUG) Log.d(TAG, "DeviceAdded=" + cachedDevice.getAddress());
         cachedDevice.registerCallback(this);
         updateConnected();
         mHandler.sendEmptyMessage(H.MSG_PAIRED_DEVICES_CHANGED);
@@ -342,7 +339,7 @@ public class BluetoothControllerImpl implements BluetoothController, BluetoothCa
 
     @Override
     public void onDeviceDeleted(CachedBluetoothDevice cachedDevice) {
-        mLogger.logDeviceDeleted(cachedDevice.getAddress());
+        if (DEBUG) Log.d(TAG, "DeviceDeleted=" + cachedDevice.getAddress());
         mCachedState.remove(cachedDevice);
         updateConnected();
         mHandler.sendEmptyMessage(H.MSG_PAIRED_DEVICES_CHANGED);
@@ -350,7 +347,7 @@ public class BluetoothControllerImpl implements BluetoothController, BluetoothCa
 
     @Override
     public void onDeviceBondStateChanged(CachedBluetoothDevice cachedDevice, int bondState) {
-        mLogger.logBondStateChange(cachedDevice.getAddress(), bondState);
+        if (DEBUG) Log.d(TAG, "DeviceBondStateChanged=" + cachedDevice.getAddress());
         mCachedState.remove(cachedDevice);
         updateConnected();
         mHandler.sendEmptyMessage(H.MSG_PAIRED_DEVICES_CHANGED);
@@ -358,29 +355,29 @@ public class BluetoothControllerImpl implements BluetoothController, BluetoothCa
 
     @Override
     public void onDeviceAttributesChanged() {
-        mLogger.logDeviceAttributesChanged();
+        if (DEBUG) Log.d(TAG, "DeviceAttributesChanged");
         updateConnected();
         mHandler.sendEmptyMessage(H.MSG_PAIRED_DEVICES_CHANGED);
     }
 
     @Override
-    public void onConnectionStateChanged(
+    public void onConnectionStateChanged(CachedBluetoothDevice cachedDevice, int state) {
-            @Nullable CachedBluetoothDevice cachedDevice,
+        if (DEBUG) {
-            @ConnectionState int state) {
+            Log.d(TAG, "ConnectionStateChanged=" + cachedDevice.getAddress() + " "
-        String address = cachedDevice == null ? null : cachedDevice.getAddress();
+                    + stateToString(state));
-        mLogger.logDeviceConnectionStateChanged(address, connectionStateToString(state));
+        }
         mCachedState.remove(cachedDevice);
         updateConnected();
         mHandler.sendEmptyMessage(H.MSG_STATE_CHANGED);
     }
 
     @Override
-    public void onProfileConnectionStateChanged(
+    public void onProfileConnectionStateChanged(CachedBluetoothDevice cachedDevice,
-            CachedBluetoothDevice cachedDevice,
+            int state, int bluetoothProfile) {
-            @ConnectionState int state,
+        if (DEBUG) {
-            int bluetoothProfile) {
+            Log.d(TAG, "ProfileConnectionStateChanged=" + cachedDevice.getAddress() + " "
-        mLogger.logProfileConnectionStateChanged(
+                    + stateToString(state) + " profileId=" + bluetoothProfile);
-                cachedDevice.getAddress(), connectionStateToString(state), bluetoothProfile);
+        }
         mCachedState.remove(cachedDevice);
         updateConnected();
         mHandler.sendEmptyMessage(H.MSG_STATE_CHANGED);
@@ -388,15 +385,20 @@ public class BluetoothControllerImpl implements BluetoothController, BluetoothCa
 
     @Override
     public void onActiveDeviceChanged(CachedBluetoothDevice activeDevice, int bluetoothProfile) {
-        mLogger.logActiveDeviceChanged(activeDevice.getAddress(), bluetoothProfile);
+        if (DEBUG) {
+            Log.d(TAG, "ActiveDeviceChanged=" + activeDevice.getAddress()
+                    + " profileId=" + bluetoothProfile);
+        }
         updateActive();
         mHandler.sendEmptyMessage(H.MSG_STATE_CHANGED);
     }
 
     @Override
     public void onAclConnectionStateChanged(CachedBluetoothDevice cachedDevice, int state) {
-        mLogger.logAclConnectionStateChanged(
+        if (DEBUG) {
-                cachedDevice.getAddress(), connectionStateToString(state));
+            Log.d(TAG, "ACLConnectionStateChanged=" + cachedDevice.getAddress() + " "
+                    + stateToString(state));
+        }
         mCachedState.remove(cachedDevice);
         updateConnected();
         mHandler.sendEmptyMessage(H.MSG_STATE_CHANGED);

packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/BluetoothControllerImplTest.java

@@ -41,7 +41,6 @@ import com.android.settingslib.bluetooth.LocalBluetoothManager;
 import com.android.settingslib.bluetooth.LocalBluetoothProfile;
 import com.android.settingslib.bluetooth.LocalBluetoothProfileManager;
 import com.android.systemui.SysuiTestCase;
-import com.android.systemui.bluetooth.BluetoothLogger;
 import com.android.systemui.dump.DumpManager;
 
 import org.junit.Before;
@@ -82,7 +81,6 @@ public class BluetoothControllerImplTest extends SysuiTestCase {
 
         mBluetoothControllerImpl = new BluetoothControllerImpl(mContext,
                 mMockDumpManager,
-                mock(BluetoothLogger.class),
                 mTestableLooper.getLooper(),
                 mTestableLooper.getLooper(),
                 mMockBluetoothManager);