From cc278a618a9bdc739bd1ae6f83d9da2551a79bab Mon Sep 17 00:00:00 2001 From: Ömer Faruk Yılmaz Date: Thu, 20 Feb 2025 02:59:56 +0000 Subject: Standardize TAG constants to use `FOO.class.getSimpleName()` as opposed to a string Bug: 397550324 Test: atest BluetoothInstrumentationTests Flag: Exempt refactor no-op Change-Id: I069a64ccc0ba00ea58b44fc1bedfb1991e25211f --- framework/java/android/bluetooth/BluetoothA2dp.java | 2 +- .../java/android/bluetooth/BluetoothA2dpSink.java | 2 +- .../java/android/bluetooth/BluetoothAdapter.java | 2 +- .../android/bluetooth/BluetoothAvrcpController.java | 2 +- .../bluetooth/BluetoothAvrcpPlayerSettings.java | 2 +- .../bluetooth/BluetoothCsipSetCoordinator.java | 2 +- .../java/android/bluetooth/BluetoothDevice.java | 2 +- framework/java/android/bluetooth/BluetoothGatt.java | 2 +- .../java/android/bluetooth/BluetoothGattServer.java | 2 +- .../java/android/bluetooth/BluetoothHeadset.java | 2 +- .../android/bluetooth/BluetoothHeadsetClient.java | 2 +- .../java/android/bluetooth/BluetoothHealth.java | 2 +- .../android/bluetooth/BluetoothHealthCallback.java | 2 +- .../java/android/bluetooth/BluetoothHearingAid.java | 4 ++-- .../java/android/bluetooth/BluetoothHidDevice.java | 3 ++- .../java/android/bluetooth/BluetoothHidHost.java | 2 +- .../java/android/bluetooth/BluetoothLeAudio.java | 2 +- .../android/bluetooth/BluetoothLeBroadcast.java | 2 +- .../bluetooth/BluetoothLeBroadcastAssistant.java | 2 +- .../android/bluetooth/BluetoothLeCallControl.java | 5 +++-- framework/java/android/bluetooth/BluetoothMap.java | 2 +- .../java/android/bluetooth/BluetoothMapClient.java | 2 +- framework/java/android/bluetooth/BluetoothPan.java | 2 +- framework/java/android/bluetooth/BluetoothPbap.java | 2 +- .../java/android/bluetooth/BluetoothPbapClient.java | 2 +- .../android/bluetooth/BluetoothQualityReport.java | 21 ++++++++++++++------- framework/java/android/bluetooth/BluetoothSap.java | 2 +- .../android/bluetooth/BluetoothServerSocket.java | 2 +- .../java/android/bluetooth/BluetoothSocket.java | 2 +- .../java/android/bluetooth/BluetoothUtils.java | 2 +- .../android/bluetooth/BluetoothVolumeControl.java | 2 +- .../java/android/bluetooth/BufferConstraint.java | 2 +- .../java/android/bluetooth/BufferConstraints.java | 2 +- framework/java/android/bluetooth/OobData.java | 2 +- .../java/android/bluetooth/le/AdvertisingSet.java | 2 +- .../android/bluetooth/le/BluetoothLeAdvertiser.java | 2 +- .../android/bluetooth/le/BluetoothLeScanner.java | 2 +- .../bluetooth/le/DistanceMeasurementManager.java | 2 +- .../bluetooth/le/DistanceMeasurementSession.java | 2 +- .../bluetooth/le/PeriodicAdvertisingManager.java | 2 +- framework/java/android/bluetooth/le/ScanRecord.java | 2 +- .../java/android/bluetooth/le/TransportBlock.java | 2 +- .../bluetooth/le/TransportDiscoveryData.java | 2 +- 43 files changed, 60 insertions(+), 51 deletions(-) (limited to 'framework/java') diff --git a/framework/java/android/bluetooth/BluetoothA2dp.java b/framework/java/android/bluetooth/BluetoothA2dp.java index ad006c9b64..da949d94d3 100644 --- a/framework/java/android/bluetooth/BluetoothA2dp.java +++ b/framework/java/android/bluetooth/BluetoothA2dp.java @@ -56,7 +56,7 @@ import java.util.List; * with its appropriate permission. */ public final class BluetoothA2dp implements BluetoothProfile { - private static final String TAG = "BluetoothA2dp"; + private static final String TAG = BluetoothA2dp.class.getSimpleName(); 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 54555b141b..1cd9c6a5cb 100644 --- a/framework/java/android/bluetooth/BluetoothA2dpSink.java +++ b/framework/java/android/bluetooth/BluetoothA2dpSink.java @@ -50,7 +50,7 @@ import java.util.List; */ @SystemApi public final class BluetoothA2dpSink implements BluetoothProfile { - private static final String TAG = "BluetoothA2dpSink"; + private static final String TAG = BluetoothA2dpSink.class.getSimpleName(); 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 35acdb959d..22c5889fbd 100644 --- a/framework/java/android/bluetooth/BluetoothAdapter.java +++ b/framework/java/android/bluetooth/BluetoothAdapter.java @@ -138,7 +138,7 @@ import java.util.function.Consumer; * @see BluetoothServerSocket */ public final class BluetoothAdapter { - private static final String TAG = "BluetoothAdapter"; + private static final String TAG = BluetoothAdapter.class.getSimpleName(); private static final String DESCRIPTOR = "android.bluetooth.BluetoothAdapter"; private static final boolean DBG = true; diff --git a/framework/java/android/bluetooth/BluetoothAvrcpController.java b/framework/java/android/bluetooth/BluetoothAvrcpController.java index bcf349bdd3..8ced189723 100644 --- a/framework/java/android/bluetooth/BluetoothAvrcpController.java +++ b/framework/java/android/bluetooth/BluetoothAvrcpController.java @@ -44,7 +44,7 @@ import java.util.List; * @hide */ public final class BluetoothAvrcpController implements BluetoothProfile { - private static final String TAG = "BluetoothAvrcpController"; + private static final String TAG = BluetoothAvrcpController.class.getSimpleName(); 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 c981a0e11f..ef220e5918 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 { - private static final String TAG = "BluetoothAvrcpPlayerSettings"; + private static final String TAG = BluetoothAvrcpPlayerSettings.class.getSimpleName(); /** 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 79227e1bbe..65edc54c5e 100644 --- a/framework/java/android/bluetooth/BluetoothCsipSetCoordinator.java +++ b/framework/java/android/bluetooth/BluetoothCsipSetCoordinator.java @@ -59,7 +59,7 @@ import java.util.concurrent.Executor; * proxy object. */ public final class BluetoothCsipSetCoordinator implements BluetoothProfile, AutoCloseable { - private static final String TAG = "BluetoothCsipSetCoordinator"; + private static final String TAG = BluetoothCsipSetCoordinator.class.getSimpleName(); 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 8d93474e1e..4c71eb19f8 100644 --- a/framework/java/android/bluetooth/BluetoothDevice.java +++ b/framework/java/android/bluetooth/BluetoothDevice.java @@ -92,7 +92,7 @@ import java.util.UUID; * @see BluetoothSocket */ public final class BluetoothDevice implements Parcelable, Attributable { - private static final String TAG = "BluetoothDevice"; + private static final String TAG = BluetoothDevice.class.getSimpleName(); private static final boolean DBG = false; diff --git a/framework/java/android/bluetooth/BluetoothGatt.java b/framework/java/android/bluetooth/BluetoothGatt.java index e7d6abe225..3e3f3a207c 100644 --- a/framework/java/android/bluetooth/BluetoothGatt.java +++ b/framework/java/android/bluetooth/BluetoothGatt.java @@ -57,7 +57,7 @@ import java.util.concurrent.CopyOnWriteArrayList; * discovered using the Bluetooth device discovery or BLE scan process. */ public final class BluetoothGatt implements BluetoothProfile { - private static final String TAG = "BluetoothGatt"; + private static final String TAG = BluetoothGatt.class.getSimpleName(); 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 82bb770f50..34002052b4 100644 --- a/framework/java/android/bluetooth/BluetoothGattServer.java +++ b/framework/java/android/bluetooth/BluetoothGattServer.java @@ -47,7 +47,7 @@ import java.util.UUID; * {@link BluetoothManager#openGattServer} to get an instance of this class. */ public final class BluetoothGattServer implements BluetoothProfile { - private static final String TAG = "BluetoothGattServer"; + private static final String TAG = BluetoothGattServer.class.getSimpleName(); 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 9c72626781..30876e8a7c 100644 --- a/framework/java/android/bluetooth/BluetoothHeadset.java +++ b/framework/java/android/bluetooth/BluetoothHeadset.java @@ -60,7 +60,7 @@ import java.util.List; * its appropriate permission. */ public final class BluetoothHeadset implements BluetoothProfile { - private static final String TAG = "BluetoothHeadset"; + private static final String TAG = BluetoothHeadset.class.getSimpleName(); 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 032d13feb3..3ef33cb845 100644 --- a/framework/java/android/bluetooth/BluetoothHeadsetClient.java +++ b/framework/java/android/bluetooth/BluetoothHeadsetClient.java @@ -58,7 +58,7 @@ import java.util.List; */ @SystemApi public final class BluetoothHeadsetClient implements BluetoothProfile, AutoCloseable { - private static final String TAG = "BluetoothHeadsetClient"; + private static final String TAG = BluetoothHeadsetClient.class.getSimpleName(); private static final boolean DBG = true; private static final boolean VDBG = false; diff --git a/framework/java/android/bluetooth/BluetoothHealth.java b/framework/java/android/bluetooth/BluetoothHealth.java index dc35303e1e..eb52628087 100644 --- a/framework/java/android/bluetooth/BluetoothHealth.java +++ b/framework/java/android/bluetooth/BluetoothHealth.java @@ -57,7 +57,7 @@ import java.util.List; */ @Deprecated public final class BluetoothHealth implements BluetoothProfile { - private static final String TAG = "BluetoothHealth"; + private static final String TAG = BluetoothHealth.class.getSimpleName(); /** * Health Profile Source Role - the health device. diff --git a/framework/java/android/bluetooth/BluetoothHealthCallback.java b/framework/java/android/bluetooth/BluetoothHealthCallback.java index 44df21b7da..faf134115c 100644 --- a/framework/java/android/bluetooth/BluetoothHealthCallback.java +++ b/framework/java/android/bluetooth/BluetoothHealthCallback.java @@ -30,7 +30,7 @@ import android.util.Log; */ @Deprecated public abstract class BluetoothHealthCallback { - private static final String TAG = "BluetoothHealthCallback"; + private static final String TAG = BluetoothHealthCallback.class.getSimpleName(); /** * Callback to inform change in registration state of the health application. diff --git a/framework/java/android/bluetooth/BluetoothHearingAid.java b/framework/java/android/bluetooth/BluetoothHearingAid.java index 1fa73a3212..29b00611d2 100644 --- a/framework/java/android/bluetooth/BluetoothHearingAid.java +++ b/framework/java/android/bluetooth/BluetoothHearingAid.java @@ -58,7 +58,7 @@ import java.util.List; * is protected with its appropriate permission. */ public final class BluetoothHearingAid implements BluetoothProfile { - private static final String TAG = "BluetoothHearingAid"; + private static final String TAG = BluetoothHearingAid.class.getSimpleName(); private static final boolean DBG = true; private static final boolean VDBG = Log.isLoggable(TAG, Log.VERBOSE); @@ -75,7 +75,7 @@ public final class BluetoothHearingAid implements BluetoothProfile { */ @SystemApi public static final class AdvertisementServiceData implements Parcelable { - private static final String TAG = "AdvertisementData"; + private static final String TAG = AdvertisementServiceData.class.getSimpleName(); private final int mCapability; private final int mTruncatedHiSyncId; diff --git a/framework/java/android/bluetooth/BluetoothHidDevice.java b/framework/java/android/bluetooth/BluetoothHidDevice.java index 5a5fb2fd3d..230b5dfaaa 100644 --- a/framework/java/android/bluetooth/BluetoothHidDevice.java +++ b/framework/java/android/bluetooth/BluetoothHidDevice.java @@ -250,7 +250,8 @@ public final class BluetoothHidDevice implements BluetoothProfile { * during app registration. */ public abstract static class Callback { - private static final String TAG = "BluetoothHidDevCallback"; + private static final String TAG = + BluetoothHidDevice.TAG + "." + Callback.class.getSimpleName(); /** * Callback called when application registration state changes. Usually it's called due to diff --git a/framework/java/android/bluetooth/BluetoothHidHost.java b/framework/java/android/bluetooth/BluetoothHidHost.java index 550266a8e7..09faae2e3f 100644 --- a/framework/java/android/bluetooth/BluetoothHidHost.java +++ b/framework/java/android/bluetooth/BluetoothHidHost.java @@ -53,7 +53,7 @@ import java.util.List; */ @SystemApi public final class BluetoothHidHost implements BluetoothProfile { - private static final String TAG = "BluetoothHidHost"; + private static final String TAG = BluetoothHidHost.class.getSimpleName(); 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 71bce08fc0..d71068308f 100644 --- a/framework/java/android/bluetooth/BluetoothLeAudio.java +++ b/framework/java/android/bluetooth/BluetoothLeAudio.java @@ -66,7 +66,7 @@ import java.util.function.Consumer; * protected with its appropriate permission. */ public final class BluetoothLeAudio implements BluetoothProfile, AutoCloseable { - private static final String TAG = "BluetoothLeAudio"; + private static final String TAG = BluetoothLeAudio.class.getSimpleName(); 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 8b532282b9..eb65dd0841 100644 --- a/framework/java/android/bluetooth/BluetoothLeBroadcast.java +++ b/framework/java/android/bluetooth/BluetoothLeBroadcast.java @@ -56,7 +56,7 @@ import java.util.concurrent.Executor; */ @SystemApi public final class BluetoothLeBroadcast implements AutoCloseable, BluetoothProfile { - private static final String TAG = "BluetoothLeBroadcast"; + private static final String TAG = BluetoothLeBroadcast.class.getSimpleName(); 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 ec87d2764b..a0ce14ade0 100644 --- a/framework/java/android/bluetooth/BluetoothLeBroadcastAssistant.java +++ b/framework/java/android/bluetooth/BluetoothLeBroadcastAssistant.java @@ -81,7 +81,7 @@ import java.util.concurrent.Executor; */ @SystemApi public final class BluetoothLeBroadcastAssistant implements BluetoothProfile, AutoCloseable { - private static final String TAG = "BluetoothLeBroadcastAssistant"; + private static final String TAG = BluetoothLeBroadcastAssistant.class.getSimpleName(); private static final boolean DBG = true; private final Map mCallbackExecutorMap = new HashMap<>(); diff --git a/framework/java/android/bluetooth/BluetoothLeCallControl.java b/framework/java/android/bluetooth/BluetoothLeCallControl.java index ae2b7266e9..8d54d56160 100644 --- a/framework/java/android/bluetooth/BluetoothLeCallControl.java +++ b/framework/java/android/bluetooth/BluetoothLeCallControl.java @@ -56,7 +56,7 @@ import java.util.concurrent.Executor; * @hide */ public final class BluetoothLeCallControl implements BluetoothProfile { - private static final String TAG = "BluetoothLeCallControl"; + private static final String TAG = BluetoothLeCallControl.class.getSimpleName(); /** @hide */ @IntDef( @@ -200,7 +200,8 @@ public final class BluetoothLeCallControl implements BluetoothProfile { * @hide */ public abstract static class Callback { - private static final String TAG = "BluetoothLeCallControl.Callback"; + private static final String TAG = + BluetoothLeCallControl.TAG + "." + Callback.class.getSimpleName(); /** * Called when a remote client requested to accept the call. diff --git a/framework/java/android/bluetooth/BluetoothMap.java b/framework/java/android/bluetooth/BluetoothMap.java index 72c458eaa3..2f079d1a90 100644 --- a/framework/java/android/bluetooth/BluetoothMap.java +++ b/framework/java/android/bluetooth/BluetoothMap.java @@ -48,7 +48,7 @@ import java.util.List; */ @SystemApi public final class BluetoothMap implements BluetoothProfile, AutoCloseable { - private static final String TAG = "BluetoothMap"; + private static final String TAG = BluetoothMap.class.getSimpleName(); 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 d29de3eb30..0f6700df80 100644 --- a/framework/java/android/bluetooth/BluetoothMapClient.java +++ b/framework/java/android/bluetooth/BluetoothMapClient.java @@ -53,7 +53,7 @@ import java.util.List; */ @SystemApi public final class BluetoothMapClient implements BluetoothProfile, AutoCloseable { - private static final String TAG = "BluetoothMapClient"; + private static final String TAG = BluetoothMapClient.class.getSimpleName(); 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 ded862bcba..6ecdc6fa2a 100644 --- a/framework/java/android/bluetooth/BluetoothPan.java +++ b/framework/java/android/bluetooth/BluetoothPan.java @@ -63,7 +63,7 @@ import java.util.concurrent.Executor; */ @SystemApi public final class BluetoothPan implements BluetoothProfile { - private static final String TAG = "BluetoothPan"; + private static final String TAG = BluetoothPan.class.getSimpleName(); 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 11962c4e4f..d4c1dfcc7a 100644 --- a/framework/java/android/bluetooth/BluetoothPbap.java +++ b/framework/java/android/bluetooth/BluetoothPbap.java @@ -61,7 +61,7 @@ import java.util.List; */ @SystemApi public class BluetoothPbap implements BluetoothProfile { - private static final String TAG = "BluetoothPbap"; + private static final String TAG = BluetoothPbap.class.getSimpleName(); private static final boolean DBG = false; diff --git a/framework/java/android/bluetooth/BluetoothPbapClient.java b/framework/java/android/bluetooth/BluetoothPbapClient.java index 285ae67535..0969c688f7 100644 --- a/framework/java/android/bluetooth/BluetoothPbapClient.java +++ b/framework/java/android/bluetooth/BluetoothPbapClient.java @@ -44,7 +44,7 @@ import java.util.List; */ @SystemApi public final class BluetoothPbapClient implements BluetoothProfile, AutoCloseable { - private static final String TAG = "BluetoothPbapClient"; + private static final String TAG = BluetoothPbapClient.class.getSimpleName(); 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 c819b76e13..28b2f998af 100644 --- a/framework/java/android/bluetooth/BluetoothQualityReport.java +++ b/framework/java/android/bluetooth/BluetoothQualityReport.java @@ -741,7 +741,8 @@ public final class BluetoothQualityReport implements Parcelable { */ @SystemApi public static final class BqrCommon implements Parcelable { - private static final String TAG = BluetoothQualityReport.TAG + ".BqrCommon"; + private static final String TAG = + BluetoothQualityReport.TAG + "." + BqrCommon.class.getSimpleName(); static final int BQR_COMMON_LEN = 85; @@ -1412,7 +1413,8 @@ public final class BluetoothQualityReport implements Parcelable { */ @SystemApi public static final class BqrVsLsto implements Parcelable { - private static final String TAG = BluetoothQualityReport.TAG + ".BqrVsLsto"; + private static final String TAG = + BluetoothQualityReport.TAG + "." + BqrVsLsto.class.getSimpleName(); private int mConnState; private long mBasebandStats; @@ -1628,7 +1630,8 @@ public final class BluetoothQualityReport implements Parcelable { */ @SystemApi public static final class BqrVsA2dpChoppy implements Parcelable { - private static final String TAG = BluetoothQualityReport.TAG + ".BqrVsA2dpChoppy"; + private static final String TAG = + BluetoothQualityReport.TAG + "." + BqrVsA2dpChoppy.class.getSimpleName(); private long mArrivalTime; private long mScheduleTime; @@ -1828,7 +1831,8 @@ public final class BluetoothQualityReport implements Parcelable { */ @SystemApi public static final class BqrVsScoChoppy implements Parcelable { - private static final String TAG = BluetoothQualityReport.TAG + ".BqrVsScoChoppy"; + private static final String TAG = + BluetoothQualityReport.TAG + "." + BqrVsScoChoppy.class.getSimpleName(); private int mGlitchCount; private int mIntervalEsco; @@ -2220,7 +2224,8 @@ public final class BluetoothQualityReport implements Parcelable { */ @SystemApi public static final class BqrConnectFail implements Parcelable { - private static final String TAG = BluetoothQualityReport.TAG + ".BqrConnectFail"; + private static final String TAG = + BluetoothQualityReport.TAG + "." + BqrConnectFail.class.getSimpleName(); /** * Connect Fail reason: No error. @@ -2383,7 +2388,8 @@ public final class BluetoothQualityReport implements Parcelable { @FlaggedApi(Flags.FLAG_SUPPORT_BLUETOOTH_QUALITY_REPORT_V6) @SystemApi public static final class BqrEnergyMonitor implements Parcelable { - private static final String TAG = BluetoothQualityReport.TAG + ".BqrEnergyMonitor"; + private static final String TAG = + BluetoothQualityReport.TAG + "." + BqrEnergyMonitor.class.getSimpleName(); private int mAvgCurrentConsume; private long mIdleTotalTime; @@ -2852,7 +2858,8 @@ public final class BluetoothQualityReport implements Parcelable { @FlaggedApi(Flags.FLAG_SUPPORT_BLUETOOTH_QUALITY_REPORT_V6) @SystemApi public static final class BqrRfStats implements Parcelable { - private static final String TAG = BluetoothQualityReport.TAG + ".BqrRfStats"; + private static final String TAG = + BluetoothQualityReport.TAG + "." + BqrRfStats.class.getSimpleName(); private int mExtensionInfo; private long mReportTimePeriod; diff --git a/framework/java/android/bluetooth/BluetoothSap.java b/framework/java/android/bluetooth/BluetoothSap.java index 24fb0e31f5..843b369be0 100644 --- a/framework/java/android/bluetooth/BluetoothSap.java +++ b/framework/java/android/bluetooth/BluetoothSap.java @@ -56,7 +56,7 @@ import java.util.List; */ @SystemApi public final class BluetoothSap implements BluetoothProfile, AutoCloseable { - private static final String TAG = "BluetoothSap"; + private static final String TAG = BluetoothSap.class.getSimpleName(); 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 8b1da255e4..e25805437a 100644 --- a/framework/java/android/bluetooth/BluetoothServerSocket.java +++ b/framework/java/android/bluetooth/BluetoothServerSocket.java @@ -71,7 +71,7 @@ import java.io.IOException; */ @SuppressLint("AndroidFrameworkBluetoothPermission") public final class BluetoothServerSocket implements Closeable { - private static final String TAG = "BluetoothServerSocket"; + private static final String TAG = BluetoothServerSocket.class.getSimpleName(); private static final boolean DBG = Log.isLoggable(TAG, Log.DEBUG); diff --git a/framework/java/android/bluetooth/BluetoothSocket.java b/framework/java/android/bluetooth/BluetoothSocket.java index 18d9b57b04..c151a483ef 100644 --- a/framework/java/android/bluetooth/BluetoothSocket.java +++ b/framework/java/android/bluetooth/BluetoothSocket.java @@ -94,7 +94,7 @@ import java.util.UUID; * @see java.io.OutputStream */ public final class BluetoothSocket implements Closeable { - private static final String TAG = "BluetoothSocket"; + private static final String TAG = BluetoothSocket.class.getSimpleName(); 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/BluetoothUtils.java b/framework/java/android/bluetooth/BluetoothUtils.java index b734ff2fef..36f6f553cf 100644 --- a/framework/java/android/bluetooth/BluetoothUtils.java +++ b/framework/java/android/bluetooth/BluetoothUtils.java @@ -36,7 +36,7 @@ import java.util.function.Supplier; /** @hide */ public final class BluetoothUtils { - private static final String TAG = "BluetoothUtils"; + private static final String TAG = BluetoothUtils.class.getSimpleName(); /** This utility class cannot be instantiated */ private BluetoothUtils() {} diff --git a/framework/java/android/bluetooth/BluetoothVolumeControl.java b/framework/java/android/bluetooth/BluetoothVolumeControl.java index 573a15c3d4..c5e89749e7 100644 --- a/framework/java/android/bluetooth/BluetoothVolumeControl.java +++ b/framework/java/android/bluetooth/BluetoothVolumeControl.java @@ -64,7 +64,7 @@ import java.util.function.Consumer; */ @SystemApi public final class BluetoothVolumeControl implements BluetoothProfile, AutoCloseable { - private static final String TAG = "BluetoothVolumeControl"; + private static final String TAG = BluetoothVolumeControl.class.getSimpleName(); private CloseGuard mCloseGuard; diff --git a/framework/java/android/bluetooth/BufferConstraint.java b/framework/java/android/bluetooth/BufferConstraint.java index f8898ab07b..936b17dd6c 100644 --- a/framework/java/android/bluetooth/BufferConstraint.java +++ b/framework/java/android/bluetooth/BufferConstraint.java @@ -28,7 +28,7 @@ import android.os.Parcelable; */ @SystemApi public final class BufferConstraint implements Parcelable { - private static final String TAG = "BufferConstraint"; + private static final String TAG = BufferConstraint.class.getSimpleName(); private int mDefaultMillis; private int mMaxMillis; diff --git a/framework/java/android/bluetooth/BufferConstraints.java b/framework/java/android/bluetooth/BufferConstraints.java index 7ad00fcddb..c8a1157849 100644 --- a/framework/java/android/bluetooth/BufferConstraints.java +++ b/framework/java/android/bluetooth/BufferConstraints.java @@ -34,7 +34,7 @@ import java.util.Map; */ @SystemApi public final class BufferConstraints implements Parcelable { - private static final String TAG = "BufferConstraints"; + private static final String TAG = BufferConstraints.class.getSimpleName(); public static final int BUFFER_CODEC_MAX_NUM = 32; diff --git a/framework/java/android/bluetooth/OobData.java b/framework/java/android/bluetooth/OobData.java index 4061290886..c1680116db 100644 --- a/framework/java/android/bluetooth/OobData.java +++ b/framework/java/android/bluetooth/OobData.java @@ -53,7 +53,7 @@ import java.lang.annotation.RetentionPolicy; */ @SystemApi public final class OobData implements Parcelable { - private static final String TAG = "OobData"; + private static final String TAG = OobData.class.getSimpleName(); /** The {@link OobData#mClassicLength} may be. (AD 3.1.1) (CSS 1.6.2) @hide */ @SystemApi public static final int OOB_LENGTH_OCTETS = 2; diff --git a/framework/java/android/bluetooth/le/AdvertisingSet.java b/framework/java/android/bluetooth/le/AdvertisingSet.java index 9df049bf08..2c2fce52e3 100644 --- a/framework/java/android/bluetooth/le/AdvertisingSet.java +++ b/framework/java/android/bluetooth/le/AdvertisingSet.java @@ -41,7 +41,7 @@ import android.util.Log; * @see AdvertiseData */ public final class AdvertisingSet { - private static final String TAG = "AdvertisingSet"; + private static final String TAG = AdvertisingSet.class.getSimpleName(); private final IBluetoothAdvertise mAdvertise; private int mAdvertiserId; diff --git a/framework/java/android/bluetooth/le/BluetoothLeAdvertiser.java b/framework/java/android/bluetooth/le/BluetoothLeAdvertiser.java index fafbd27a71..536baa301a 100644 --- a/framework/java/android/bluetooth/le/BluetoothLeAdvertiser.java +++ b/framework/java/android/bluetooth/le/BluetoothLeAdvertiser.java @@ -57,7 +57,7 @@ import java.util.Map; * @see AdvertiseData */ public final class BluetoothLeAdvertiser { - private static final String TAG = "BluetoothLeAdvertiser"; + private static final String TAG = BluetoothLeAdvertiser.class.getSimpleName(); private static final int MAX_LEGACY_ADVERTISING_DATA_BYTES = 31; // Each fields need one byte for field length and another byte for field type. diff --git a/framework/java/android/bluetooth/le/BluetoothLeScanner.java b/framework/java/android/bluetooth/le/BluetoothLeScanner.java index 18f57a26a9..02f48fb8d8 100644 --- a/framework/java/android/bluetooth/le/BluetoothLeScanner.java +++ b/framework/java/android/bluetooth/le/BluetoothLeScanner.java @@ -58,7 +58,7 @@ import java.util.Map; * @see ScanFilter */ public final class BluetoothLeScanner { - private static final String TAG = "BluetoothLeScanner"; + private static final String TAG = BluetoothLeScanner.class.getSimpleName(); private static final boolean DBG = true; private static final boolean VDBG = false; diff --git a/framework/java/android/bluetooth/le/DistanceMeasurementManager.java b/framework/java/android/bluetooth/le/DistanceMeasurementManager.java index 88933ae5d9..6209e31946 100644 --- a/framework/java/android/bluetooth/le/DistanceMeasurementManager.java +++ b/framework/java/android/bluetooth/le/DistanceMeasurementManager.java @@ -62,7 +62,7 @@ import java.util.stream.Collectors; */ @SystemApi public final class DistanceMeasurementManager { - private static final String TAG = "DistanceMeasurementManager"; + private static final String TAG = DistanceMeasurementManager.class.getSimpleName(); private final ConcurrentHashMap mSessionMap = new ConcurrentHashMap<>(); diff --git a/framework/java/android/bluetooth/le/DistanceMeasurementSession.java b/framework/java/android/bluetooth/le/DistanceMeasurementSession.java index d0c9547967..3241e68b59 100644 --- a/framework/java/android/bluetooth/le/DistanceMeasurementSession.java +++ b/framework/java/android/bluetooth/le/DistanceMeasurementSession.java @@ -58,7 +58,7 @@ import java.util.concurrent.Executor; */ @SystemApi public final class DistanceMeasurementSession { - private static final String TAG = "DistanceMeasurementSession"; + private static final String TAG = DistanceMeasurementSession.class.getSimpleName(); private final IDistanceMeasurement mDistanceMeasurement; private final ParcelUuid mUuid; diff --git a/framework/java/android/bluetooth/le/PeriodicAdvertisingManager.java b/framework/java/android/bluetooth/le/PeriodicAdvertisingManager.java index 8f1c375615..581778f55d 100644 --- a/framework/java/android/bluetooth/le/PeriodicAdvertisingManager.java +++ b/framework/java/android/bluetooth/le/PeriodicAdvertisingManager.java @@ -48,7 +48,7 @@ import java.util.IdentityHashMap; * @hide */ public final class PeriodicAdvertisingManager { - private static final String TAG = "PeriodicAdvertisingManager"; + private static final String TAG = PeriodicAdvertisingManager.class.getSimpleName(); private static final int SKIP_MIN = 0; private static final int SKIP_MAX = 499; diff --git a/framework/java/android/bluetooth/le/ScanRecord.java b/framework/java/android/bluetooth/le/ScanRecord.java index 5bd2f7fda7..b5d4ab341d 100644 --- a/framework/java/android/bluetooth/le/ScanRecord.java +++ b/framework/java/android/bluetooth/le/ScanRecord.java @@ -41,7 +41,7 @@ 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"; + private static final String TAG = ScanRecord.class.getSimpleName(); /** @hide */ @IntDef( diff --git a/framework/java/android/bluetooth/le/TransportBlock.java b/framework/java/android/bluetooth/le/TransportBlock.java index 498b380a88..2e5789813c 100644 --- a/framework/java/android/bluetooth/le/TransportBlock.java +++ b/framework/java/android/bluetooth/le/TransportBlock.java @@ -34,7 +34,7 @@ import java.util.Arrays; * @see AdvertiseData */ public final class TransportBlock implements Parcelable { - private static final String TAG = "TransportBlock"; + private static final String TAG = TransportBlock.class.getSimpleName(); private final int mOrgId; private final int mTdsFlags; diff --git a/framework/java/android/bluetooth/le/TransportDiscoveryData.java b/framework/java/android/bluetooth/le/TransportDiscoveryData.java index 52c5ca6184..c1d6abcd6e 100644 --- a/framework/java/android/bluetooth/le/TransportDiscoveryData.java +++ b/framework/java/android/bluetooth/le/TransportDiscoveryData.java @@ -37,7 +37,7 @@ import java.util.List; * @see AdvertiseData */ public final class TransportDiscoveryData implements Parcelable { - private static final String TAG = "TransportDiscoveryData"; + private static final String TAG = TransportDiscoveryData.class.getSimpleName(); private final int mTransportDataType; private final List mTransportBlocks; -- cgit v1.2.3-59-g8ed1b