From 26e3afb97edcd25f2bcc11303576cc776618c4c9 Mon Sep 17 00:00:00 2001
From: Ömer Faruk Yılmaz <ofy@google.com>
Date: Mon, 17 Feb 2025 06:58:15 +0000
Subject: Improve encapsulation and standardize TAG constants across the
 codebase

The log TAG should use the lowest visibility possible.
It should always be the first line after class declaration with an
empty line that follows it.

Bug: 394958283
Test: atest BluetoothInstrumentationTests
Flag: Exempt refactor no-op
Change-Id: I09e8a3f75a33eed4b2d5fcbc70b4347ab6ded2a9
---
 framework/java/android/bluetooth/BluetoothA2dp.java                 | 1 +
 framework/java/android/bluetooth/BluetoothA2dpSink.java             | 1 +
 framework/java/android/bluetooth/BluetoothAdapter.java              | 1 +
 framework/java/android/bluetooth/BluetoothAvrcpController.java      | 1 +
 framework/java/android/bluetooth/BluetoothAvrcpPlayerSettings.java  | 2 +-
 framework/java/android/bluetooth/BluetoothCsipSetCoordinator.java   | 1 +
 framework/java/android/bluetooth/BluetoothDevice.java               | 1 +
 framework/java/android/bluetooth/BluetoothGatt.java                 | 1 +
 framework/java/android/bluetooth/BluetoothGattServer.java           | 1 +
 framework/java/android/bluetooth/BluetoothHeadset.java              | 1 +
 framework/java/android/bluetooth/BluetoothHeadsetClient.java        | 1 +
 framework/java/android/bluetooth/BluetoothHearingAid.java           | 1 +
 framework/java/android/bluetooth/BluetoothHidDevice.java            | 2 +-
 framework/java/android/bluetooth/BluetoothHidHost.java              | 1 +
 framework/java/android/bluetooth/BluetoothLeAudio.java              | 1 +
 framework/java/android/bluetooth/BluetoothLeBroadcast.java          | 1 +
 framework/java/android/bluetooth/BluetoothLeBroadcastAssistant.java | 1 +
 framework/java/android/bluetooth/BluetoothLeCallControl.java        | 1 -
 framework/java/android/bluetooth/BluetoothMap.java                  | 2 +-
 framework/java/android/bluetooth/BluetoothMapClient.java            | 2 +-
 framework/java/android/bluetooth/BluetoothPan.java                  | 1 +
 framework/java/android/bluetooth/BluetoothPbap.java                 | 2 +-
 framework/java/android/bluetooth/BluetoothPbapClient.java           | 2 +-
 framework/java/android/bluetooth/BluetoothQualityReport.java        | 1 +
 framework/java/android/bluetooth/BluetoothSap.java                  | 2 +-
 framework/java/android/bluetooth/BluetoothServerSocket.java         | 2 +-
 framework/java/android/bluetooth/BluetoothSocket.java               | 1 +
 framework/java/android/bluetooth/BufferConstraint.java              | 2 +-
 framework/java/android/bluetooth/BufferConstraints.java             | 4 ++--
 framework/java/android/bluetooth/OobData.java                       | 1 -
 framework/java/android/bluetooth/le/BluetoothLeAdvertiser.java      | 1 -
 framework/java/android/bluetooth/le/BluetoothLeScanner.java         | 2 +-
 framework/java/android/bluetooth/le/PeriodicAdvertisingManager.java | 1 -
 framework/java/android/bluetooth/le/ScanRecord.java                 | 1 -
 framework/java/android/bluetooth/le/TransportBlock.java             | 1 +
 framework/java/android/bluetooth/le/TransportDiscoveryData.java     | 1 +
 36 files changed, 32 insertions(+), 17 deletions(-)

(limited to 'framework/java')

diff --git a/framework/java/android/bluetooth/BluetoothA2dp.java b/framework/java/android/bluetooth/BluetoothA2dp.java
index 54f2c702aa..ad006c9b64 100644
--- a/framework/java/android/bluetooth/BluetoothA2dp.java
+++ b/framework/java/android/bluetooth/BluetoothA2dp.java
@@ -57,6 +57,7 @@ import java.util.List;
  */
 public final class BluetoothA2dp implements BluetoothProfile {
     private static final String TAG = "BluetoothA2dp";
+
     private static final boolean DBG = true;
     private static final boolean VDBG = false;
 
diff --git a/framework/java/android/bluetooth/BluetoothA2dpSink.java b/framework/java/android/bluetooth/BluetoothA2dpSink.java
index ecaa9d33d7..54555b141b 100644
--- a/framework/java/android/bluetooth/BluetoothA2dpSink.java
+++ b/framework/java/android/bluetooth/BluetoothA2dpSink.java
@@ -51,6 +51,7 @@ import java.util.List;
 @SystemApi
 public final class BluetoothA2dpSink implements BluetoothProfile {
     private static final String TAG = "BluetoothA2dpSink";
+
     private static final boolean DBG = true;
     private static final boolean VDBG = false;
 
diff --git a/framework/java/android/bluetooth/BluetoothAdapter.java b/framework/java/android/bluetooth/BluetoothAdapter.java
index 3fcda779e6..35acdb959d 100644
--- a/framework/java/android/bluetooth/BluetoothAdapter.java
+++ b/framework/java/android/bluetooth/BluetoothAdapter.java
@@ -139,6 +139,7 @@ import java.util.function.Consumer;
  */
 public final class BluetoothAdapter {
     private static final String TAG = "BluetoothAdapter";
+
     private static final String DESCRIPTOR = "android.bluetooth.BluetoothAdapter";
     private static final boolean DBG = true;
     private static final boolean VDBG = false;
diff --git a/framework/java/android/bluetooth/BluetoothAvrcpController.java b/framework/java/android/bluetooth/BluetoothAvrcpController.java
index 17311d6087..bcf349bdd3 100644
--- a/framework/java/android/bluetooth/BluetoothAvrcpController.java
+++ b/framework/java/android/bluetooth/BluetoothAvrcpController.java
@@ -45,6 +45,7 @@ import java.util.List;
  */
 public final class BluetoothAvrcpController implements BluetoothProfile {
     private static final String TAG = "BluetoothAvrcpController";
+
     private static final boolean DBG = false;
     private static final boolean VDBG = false;
 
diff --git a/framework/java/android/bluetooth/BluetoothAvrcpPlayerSettings.java b/framework/java/android/bluetooth/BluetoothAvrcpPlayerSettings.java
index 8ce7da1f6e..c981a0e11f 100644
--- a/framework/java/android/bluetooth/BluetoothAvrcpPlayerSettings.java
+++ b/framework/java/android/bluetooth/BluetoothAvrcpPlayerSettings.java
@@ -30,7 +30,7 @@ import java.util.Map;
  * @hide
  */
 public final class BluetoothAvrcpPlayerSettings implements Parcelable {
-    public static final String TAG = "BluetoothAvrcpPlayerSettings";
+    private static final String TAG = "BluetoothAvrcpPlayerSettings";
 
     /** Equalizer setting. */
     public static final int SETTING_EQUALIZER = 0x01;
diff --git a/framework/java/android/bluetooth/BluetoothCsipSetCoordinator.java b/framework/java/android/bluetooth/BluetoothCsipSetCoordinator.java
index 44d7b29465..79227e1bbe 100644
--- a/framework/java/android/bluetooth/BluetoothCsipSetCoordinator.java
+++ b/framework/java/android/bluetooth/BluetoothCsipSetCoordinator.java
@@ -60,6 +60,7 @@ import java.util.concurrent.Executor;
  */
 public final class BluetoothCsipSetCoordinator implements BluetoothProfile, AutoCloseable {
     private static final String TAG = "BluetoothCsipSetCoordinator";
+
     private static final boolean DBG = false;
     private static final boolean VDBG = false;
 
diff --git a/framework/java/android/bluetooth/BluetoothDevice.java b/framework/java/android/bluetooth/BluetoothDevice.java
index a4cacbf0a8..8d93474e1e 100644
--- a/framework/java/android/bluetooth/BluetoothDevice.java
+++ b/framework/java/android/bluetooth/BluetoothDevice.java
@@ -93,6 +93,7 @@ import java.util.UUID;
  */
 public final class BluetoothDevice implements Parcelable, Attributable {
     private static final String TAG = "BluetoothDevice";
+
     private static final boolean DBG = false;
 
     /**
diff --git a/framework/java/android/bluetooth/BluetoothGatt.java b/framework/java/android/bluetooth/BluetoothGatt.java
index 7e211b5d5b..e7d6abe225 100644
--- a/framework/java/android/bluetooth/BluetoothGatt.java
+++ b/framework/java/android/bluetooth/BluetoothGatt.java
@@ -58,6 +58,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
  */
 public final class BluetoothGatt implements BluetoothProfile {
     private static final String TAG = "BluetoothGatt";
+
     private static final boolean DBG = true;
     private static final boolean VDBG = false;
 
diff --git a/framework/java/android/bluetooth/BluetoothGattServer.java b/framework/java/android/bluetooth/BluetoothGattServer.java
index 94bf7ae4c4..82bb770f50 100644
--- a/framework/java/android/bluetooth/BluetoothGattServer.java
+++ b/framework/java/android/bluetooth/BluetoothGattServer.java
@@ -48,6 +48,7 @@ import java.util.UUID;
  */
 public final class BluetoothGattServer implements BluetoothProfile {
     private static final String TAG = "BluetoothGattServer";
+
     private static final boolean DBG = true;
     private static final boolean VDBG = false;
 
diff --git a/framework/java/android/bluetooth/BluetoothHeadset.java b/framework/java/android/bluetooth/BluetoothHeadset.java
index 188a78e0d8..9c72626781 100644
--- a/framework/java/android/bluetooth/BluetoothHeadset.java
+++ b/framework/java/android/bluetooth/BluetoothHeadset.java
@@ -61,6 +61,7 @@ import java.util.List;
  */
 public final class BluetoothHeadset implements BluetoothProfile {
     private static final String TAG = "BluetoothHeadset";
+
     private static final boolean DBG = Log.isLoggable(TAG, Log.DEBUG);
     private static final boolean VDBG = false;
 
diff --git a/framework/java/android/bluetooth/BluetoothHeadsetClient.java b/framework/java/android/bluetooth/BluetoothHeadsetClient.java
index e991f4c764..032d13feb3 100644
--- a/framework/java/android/bluetooth/BluetoothHeadsetClient.java
+++ b/framework/java/android/bluetooth/BluetoothHeadsetClient.java
@@ -59,6 +59,7 @@ import java.util.List;
 @SystemApi
 public final class BluetoothHeadsetClient implements BluetoothProfile, AutoCloseable {
     private static final String TAG = "BluetoothHeadsetClient";
+
     private static final boolean DBG = true;
     private static final boolean VDBG = false;
     private final CloseGuard mCloseGuard;
diff --git a/framework/java/android/bluetooth/BluetoothHearingAid.java b/framework/java/android/bluetooth/BluetoothHearingAid.java
index 110e6f8caa..1fa73a3212 100644
--- a/framework/java/android/bluetooth/BluetoothHearingAid.java
+++ b/framework/java/android/bluetooth/BluetoothHearingAid.java
@@ -59,6 +59,7 @@ import java.util.List;
  */
 public final class BluetoothHearingAid implements BluetoothProfile {
     private static final String TAG = "BluetoothHearingAid";
+
     private static final boolean DBG = true;
     private static final boolean VDBG = Log.isLoggable(TAG, Log.VERBOSE);
 
diff --git a/framework/java/android/bluetooth/BluetoothHidDevice.java b/framework/java/android/bluetooth/BluetoothHidDevice.java
index 207cab3ca8..5a5fb2fd3d 100644
--- a/framework/java/android/bluetooth/BluetoothHidDevice.java
+++ b/framework/java/android/bluetooth/BluetoothHidDevice.java
@@ -46,6 +46,7 @@ import java.util.concurrent.Executor;
  */
 public final class BluetoothHidDevice implements BluetoothProfile {
     private static final String TAG = BluetoothHidDevice.class.getSimpleName();
+
     private static final boolean DBG = false;
 
     /**
@@ -249,7 +250,6 @@ public final class BluetoothHidDevice implements BluetoothProfile {
      * during app registration.
      */
     public abstract static class Callback {
-
         private static final String TAG = "BluetoothHidDevCallback";
 
         /**
diff --git a/framework/java/android/bluetooth/BluetoothHidHost.java b/framework/java/android/bluetooth/BluetoothHidHost.java
index 123590a148..550266a8e7 100644
--- a/framework/java/android/bluetooth/BluetoothHidHost.java
+++ b/framework/java/android/bluetooth/BluetoothHidHost.java
@@ -54,6 +54,7 @@ import java.util.List;
 @SystemApi
 public final class BluetoothHidHost implements BluetoothProfile {
     private static final String TAG = "BluetoothHidHost";
+
     private static final boolean DBG = true;
     private static final boolean VDBG = false;
 
diff --git a/framework/java/android/bluetooth/BluetoothLeAudio.java b/framework/java/android/bluetooth/BluetoothLeAudio.java
index 02a93d967f..71bce08fc0 100644
--- a/framework/java/android/bluetooth/BluetoothLeAudio.java
+++ b/framework/java/android/bluetooth/BluetoothLeAudio.java
@@ -67,6 +67,7 @@ import java.util.function.Consumer;
  */
 public final class BluetoothLeAudio implements BluetoothProfile, AutoCloseable {
     private static final String TAG = "BluetoothLeAudio";
+
     private static final boolean DBG = Log.isLoggable(TAG, Log.DEBUG);
     private static final boolean VDBG = false;
 
diff --git a/framework/java/android/bluetooth/BluetoothLeBroadcast.java b/framework/java/android/bluetooth/BluetoothLeBroadcast.java
index 7ebc5cb82e..8b532282b9 100644
--- a/framework/java/android/bluetooth/BluetoothLeBroadcast.java
+++ b/framework/java/android/bluetooth/BluetoothLeBroadcast.java
@@ -57,6 +57,7 @@ import java.util.concurrent.Executor;
 @SystemApi
 public final class BluetoothLeBroadcast implements AutoCloseable, BluetoothProfile {
     private static final String TAG = "BluetoothLeBroadcast";
+
     private static final boolean DBG = true;
     private static final boolean VDBG = false;
 
diff --git a/framework/java/android/bluetooth/BluetoothLeBroadcastAssistant.java b/framework/java/android/bluetooth/BluetoothLeBroadcastAssistant.java
index f789bf73d4..ec87d2764b 100644
--- a/framework/java/android/bluetooth/BluetoothLeBroadcastAssistant.java
+++ b/framework/java/android/bluetooth/BluetoothLeBroadcastAssistant.java
@@ -82,6 +82,7 @@ import java.util.concurrent.Executor;
 @SystemApi
 public final class BluetoothLeBroadcastAssistant implements BluetoothProfile, AutoCloseable {
     private static final String TAG = "BluetoothLeBroadcastAssistant";
+
     private static final boolean DBG = true;
     private final Map<Callback, Executor> mCallbackExecutorMap = new HashMap<>();
 
diff --git a/framework/java/android/bluetooth/BluetoothLeCallControl.java b/framework/java/android/bluetooth/BluetoothLeCallControl.java
index 9da2f90e82..ae2b7266e9 100644
--- a/framework/java/android/bluetooth/BluetoothLeCallControl.java
+++ b/framework/java/android/bluetooth/BluetoothLeCallControl.java
@@ -200,7 +200,6 @@ public final class BluetoothLeCallControl implements BluetoothProfile {
      * @hide
      */
     public abstract static class Callback {
-
         private static final String TAG = "BluetoothLeCallControl.Callback";
 
         /**
diff --git a/framework/java/android/bluetooth/BluetoothMap.java b/framework/java/android/bluetooth/BluetoothMap.java
index 0630fab93c..72c458eaa3 100644
--- a/framework/java/android/bluetooth/BluetoothMap.java
+++ b/framework/java/android/bluetooth/BluetoothMap.java
@@ -48,8 +48,8 @@ import java.util.List;
  */
 @SystemApi
 public final class BluetoothMap implements BluetoothProfile, AutoCloseable {
-
     private static final String TAG = "BluetoothMap";
+
     private static final boolean DBG = true;
     private static final boolean VDBG = false;
 
diff --git a/framework/java/android/bluetooth/BluetoothMapClient.java b/framework/java/android/bluetooth/BluetoothMapClient.java
index 7b4feeaf6f..d29de3eb30 100644
--- a/framework/java/android/bluetooth/BluetoothMapClient.java
+++ b/framework/java/android/bluetooth/BluetoothMapClient.java
@@ -53,8 +53,8 @@ import java.util.List;
  */
 @SystemApi
 public final class BluetoothMapClient implements BluetoothProfile, AutoCloseable {
-
     private static final String TAG = "BluetoothMapClient";
+
     private static final boolean DBG = Log.isLoggable(TAG, Log.DEBUG);
     private static final boolean VDBG = Log.isLoggable(TAG, Log.VERBOSE);
 
diff --git a/framework/java/android/bluetooth/BluetoothPan.java b/framework/java/android/bluetooth/BluetoothPan.java
index 15066a0297..ded862bcba 100644
--- a/framework/java/android/bluetooth/BluetoothPan.java
+++ b/framework/java/android/bluetooth/BluetoothPan.java
@@ -64,6 +64,7 @@ import java.util.concurrent.Executor;
 @SystemApi
 public final class BluetoothPan implements BluetoothProfile {
     private static final String TAG = "BluetoothPan";
+
     private static final boolean DBG = true;
     private static final boolean VDBG = false;
 
diff --git a/framework/java/android/bluetooth/BluetoothPbap.java b/framework/java/android/bluetooth/BluetoothPbap.java
index b94cbeebf8..11962c4e4f 100644
--- a/framework/java/android/bluetooth/BluetoothPbap.java
+++ b/framework/java/android/bluetooth/BluetoothPbap.java
@@ -61,8 +61,8 @@ import java.util.List;
  */
 @SystemApi
 public class BluetoothPbap implements BluetoothProfile {
-
     private static final String TAG = "BluetoothPbap";
+
     private static final boolean DBG = false;
 
     /**
diff --git a/framework/java/android/bluetooth/BluetoothPbapClient.java b/framework/java/android/bluetooth/BluetoothPbapClient.java
index 38d984aa75..285ae67535 100644
--- a/framework/java/android/bluetooth/BluetoothPbapClient.java
+++ b/framework/java/android/bluetooth/BluetoothPbapClient.java
@@ -44,8 +44,8 @@ import java.util.List;
  */
 @SystemApi
 public final class BluetoothPbapClient implements BluetoothProfile, AutoCloseable {
-
     private static final String TAG = "BluetoothPbapClient";
+
     private static final boolean DBG = false;
     private static final boolean VDBG = false;
 
diff --git a/framework/java/android/bluetooth/BluetoothQualityReport.java b/framework/java/android/bluetooth/BluetoothQualityReport.java
index 99a234f551..c819b76e13 100644
--- a/framework/java/android/bluetooth/BluetoothQualityReport.java
+++ b/framework/java/android/bluetooth/BluetoothQualityReport.java
@@ -742,6 +742,7 @@ public final class BluetoothQualityReport implements Parcelable {
     @SystemApi
     public static final class BqrCommon implements Parcelable {
         private static final String TAG = BluetoothQualityReport.TAG + ".BqrCommon";
+
         static final int BQR_COMMON_LEN = 85;
 
         private @QualityReportId int mQualityReportId;
diff --git a/framework/java/android/bluetooth/BluetoothSap.java b/framework/java/android/bluetooth/BluetoothSap.java
index 8d467720ff..24fb0e31f5 100644
--- a/framework/java/android/bluetooth/BluetoothSap.java
+++ b/framework/java/android/bluetooth/BluetoothSap.java
@@ -56,8 +56,8 @@ import java.util.List;
  */
 @SystemApi
 public final class BluetoothSap implements BluetoothProfile, AutoCloseable {
-
     private static final String TAG = "BluetoothSap";
+
     private static final boolean DBG = true;
     private static final boolean VDBG = false;
 
diff --git a/framework/java/android/bluetooth/BluetoothServerSocket.java b/framework/java/android/bluetooth/BluetoothServerSocket.java
index 1cf1bde3c8..8b1da255e4 100644
--- a/framework/java/android/bluetooth/BluetoothServerSocket.java
+++ b/framework/java/android/bluetooth/BluetoothServerSocket.java
@@ -71,8 +71,8 @@ import java.io.IOException;
  */
 @SuppressLint("AndroidFrameworkBluetoothPermission")
 public final class BluetoothServerSocket implements Closeable {
-
     private static final String TAG = "BluetoothServerSocket";
+
     private static final boolean DBG = Log.isLoggable(TAG, Log.DEBUG);
 
     @UnsupportedAppUsage(
diff --git a/framework/java/android/bluetooth/BluetoothSocket.java b/framework/java/android/bluetooth/BluetoothSocket.java
index cde23baf4d..18d9b57b04 100644
--- a/framework/java/android/bluetooth/BluetoothSocket.java
+++ b/framework/java/android/bluetooth/BluetoothSocket.java
@@ -95,6 +95,7 @@ import java.util.UUID;
  */
 public final class BluetoothSocket implements Closeable {
     private static final String TAG = "BluetoothSocket";
+
     private static final boolean DBG = Log.isLoggable(TAG, Log.DEBUG);
     private static final boolean VDBG = Log.isLoggable(TAG, Log.VERBOSE);
 
diff --git a/framework/java/android/bluetooth/BufferConstraint.java b/framework/java/android/bluetooth/BufferConstraint.java
index 25fb21798a..f8898ab07b 100644
--- a/framework/java/android/bluetooth/BufferConstraint.java
+++ b/framework/java/android/bluetooth/BufferConstraint.java
@@ -28,8 +28,8 @@ import android.os.Parcelable;
  */
 @SystemApi
 public final class BufferConstraint implements Parcelable {
-
     private static final String TAG = "BufferConstraint";
+
     private int mDefaultMillis;
     private int mMaxMillis;
     private int mMinMillis;
diff --git a/framework/java/android/bluetooth/BufferConstraints.java b/framework/java/android/bluetooth/BufferConstraints.java
index 1fbebaa8b7..7ad00fcddb 100644
--- a/framework/java/android/bluetooth/BufferConstraints.java
+++ b/framework/java/android/bluetooth/BufferConstraints.java
@@ -34,10 +34,10 @@ import java.util.Map;
  */
 @SystemApi
 public final class BufferConstraints implements Parcelable {
-    public static final int BUFFER_CODEC_MAX_NUM = 32;
-
     private static final String TAG = "BufferConstraints";
 
+    public static final int BUFFER_CODEC_MAX_NUM = 32;
+
     private Map<Integer, BufferConstraint> mBufferConstraints;
     private List<BufferConstraint> mBufferConstraintList;
 
diff --git a/framework/java/android/bluetooth/OobData.java b/framework/java/android/bluetooth/OobData.java
index e6c5f945d8..4061290886 100644
--- a/framework/java/android/bluetooth/OobData.java
+++ b/framework/java/android/bluetooth/OobData.java
@@ -53,7 +53,6 @@ import java.lang.annotation.RetentionPolicy;
  */
 @SystemApi
 public final class OobData implements Parcelable {
-
     private static final String TAG = "OobData";
 
     /** The {@link OobData#mClassicLength} may be. (AD 3.1.1) (CSS 1.6.2) @hide */
diff --git a/framework/java/android/bluetooth/le/BluetoothLeAdvertiser.java b/framework/java/android/bluetooth/le/BluetoothLeAdvertiser.java
index b835580c6c..fafbd27a71 100644
--- a/framework/java/android/bluetooth/le/BluetoothLeAdvertiser.java
+++ b/framework/java/android/bluetooth/le/BluetoothLeAdvertiser.java
@@ -57,7 +57,6 @@ import java.util.Map;
  * @see AdvertiseData
  */
 public final class BluetoothLeAdvertiser {
-
     private static final String TAG = "BluetoothLeAdvertiser";
 
     private static final int MAX_LEGACY_ADVERTISING_DATA_BYTES = 31;
diff --git a/framework/java/android/bluetooth/le/BluetoothLeScanner.java b/framework/java/android/bluetooth/le/BluetoothLeScanner.java
index aeac2e2f0f..18f57a26a9 100644
--- a/framework/java/android/bluetooth/le/BluetoothLeScanner.java
+++ b/framework/java/android/bluetooth/le/BluetoothLeScanner.java
@@ -58,8 +58,8 @@ import java.util.Map;
  * @see ScanFilter
  */
 public final class BluetoothLeScanner {
-
     private static final String TAG = "BluetoothLeScanner";
+
     private static final boolean DBG = true;
     private static final boolean VDBG = false;
 
diff --git a/framework/java/android/bluetooth/le/PeriodicAdvertisingManager.java b/framework/java/android/bluetooth/le/PeriodicAdvertisingManager.java
index 863bfffdea..8f1c375615 100644
--- a/framework/java/android/bluetooth/le/PeriodicAdvertisingManager.java
+++ b/framework/java/android/bluetooth/le/PeriodicAdvertisingManager.java
@@ -48,7 +48,6 @@ import java.util.IdentityHashMap;
  * @hide
  */
 public final class PeriodicAdvertisingManager {
-
     private static final String TAG = "PeriodicAdvertisingManager";
 
     private static final int SKIP_MIN = 0;
diff --git a/framework/java/android/bluetooth/le/ScanRecord.java b/framework/java/android/bluetooth/le/ScanRecord.java
index d5b3b46e4e..5bd2f7fda7 100644
--- a/framework/java/android/bluetooth/le/ScanRecord.java
+++ b/framework/java/android/bluetooth/le/ScanRecord.java
@@ -41,7 +41,6 @@ import java.util.function.Predicate;
 /** Represents a scan record from Bluetooth LE scan. */
 @SuppressLint("AndroidFrameworkBluetoothPermission")
 public final class ScanRecord {
-
     private static final String TAG = "ScanRecord";
 
     /** @hide */
diff --git a/framework/java/android/bluetooth/le/TransportBlock.java b/framework/java/android/bluetooth/le/TransportBlock.java
index 15acafd01a..498b380a88 100644
--- a/framework/java/android/bluetooth/le/TransportBlock.java
+++ b/framework/java/android/bluetooth/le/TransportBlock.java
@@ -35,6 +35,7 @@ import java.util.Arrays;
  */
 public final class TransportBlock implements Parcelable {
     private static final String TAG = "TransportBlock";
+
     private final int mOrgId;
     private final int mTdsFlags;
     private final int mTransportDataLength;
diff --git a/framework/java/android/bluetooth/le/TransportDiscoveryData.java b/framework/java/android/bluetooth/le/TransportDiscoveryData.java
index 21492e1681..52c5ca6184 100644
--- a/framework/java/android/bluetooth/le/TransportDiscoveryData.java
+++ b/framework/java/android/bluetooth/le/TransportDiscoveryData.java
@@ -38,6 +38,7 @@ import java.util.List;
  */
 public final class TransportDiscoveryData implements Parcelable {
     private static final String TAG = "TransportDiscoveryData";
+
     private final int mTransportDataType;
     private final List<TransportBlock> mTransportBlocks;
 
-- 
cgit v1.2.3-59-g8ed1b