Merge "Clean TAG substring and nit" into main

android/app/src/com/android/bluetooth/a2dp/A2dpService.java

@@ -148,7 +148,7 @@ public class A2dpService extends ProfileService {
             throw new IllegalStateException("start() called twice");
         }
 
-        // Step 1: Get AdapterService, A2dpNativeInterface, DatabaseManager, AudioManager.
+        // Step 1: Get AdapterService, DatabaseManager, AudioManager.
         // None of them can be null.
         mAdapterService =
                 requireNonNull(

android/app/src/com/android/bluetooth/avrcpcontroller/AvrcpControllerNativeInterface.java

@@ -29,7 +29,7 @@ import java.util.UUID;
 
 /** Provides Bluetooth AVRCP Controller native interface for the AVRCP Controller service */
 public class AvrcpControllerNativeInterface {
-    static final String TAG = AvrcpControllerNativeInterface.class.getSimpleName().substring(0, 23);
+    static final String TAG = AvrcpControllerNativeInterface.class.getSimpleName();
     static final boolean DBG = Log.isLoggable(TAG, Log.DEBUG);
     static final boolean VDBG = Log.isLoggable(TAG, Log.VERBOSE);
 

android/app/src/com/android/bluetooth/hap/HapClientNativeInterface.java

@@ -29,12 +29,9 @@ import com.android.internal.annotations.VisibleForTesting;
 import java.util.ArrayList;
 import java.util.Arrays;
 
-/**
- * Hearing Access Profile Client Native Interface to/from JNI.
- */
+/** Hearing Access Profile Client Native Interface to/from JNI. */
 public class HapClientNativeInterface {
-    private static final String TAG =
-            HapClientNativeInterface.class.getSimpleName().substring(0, 23);
+    private static final String TAG = HapClientNativeInterface.class.getSimpleName();
     private static final boolean DBG = Log.isLoggable(TAG, Log.DEBUG);
 
     private final BluetoothAdapter mAdapter;