Errorprone fix & enforce FieldCanBeFinal

Bug: 344658662
Test: m BluetoothInstrumentationTests
Test: m .
Flag: Exempt refactor
Change-Id: Iea773640f276794f32020685feb886b53485a0c1

2 files changed, 3 insertions, 3 deletions

diff --git a/service/src/com/android/server/bluetooth/BluetoothManagerService.java b/service/src/com/android/server/bluetooth/BluetoothManagerService.java
index 6cd63181da..fe63ff1c21 100644
--- a/service/src/com/android/server/bluetooth/BluetoothManagerService.java
+++ b/service/src/com/android/server/bluetooth/BluetoothManagerService.java
@@ -827,7 +827,7 @@ class BluetoothManagerService {
     }
 
     class ClientDeathRecipient implements IBinder.DeathRecipient {
-        private String mPackageName;
+        private final String mPackageName;
 
         ClientDeathRecipient(String packageName) {
             mPackageName = packageName;
@@ -1356,7 +1356,7 @@ class BluetoothManagerService {
         }
     }
 
-    private BluetoothServiceConnection mConnection = new BluetoothServiceConnection();
+    private final BluetoothServiceConnection mConnection = new BluetoothServiceConnection();
     private int mWaitForEnableRetry;
     private int mWaitForDisableRetry;
 
diff --git a/service/tests/src/com/android/server/bluetooth/BluetoothServiceBinderTest.java b/service/tests/src/com/android/server/bluetooth/BluetoothServiceBinderTest.java
index 07466e59c4..ec4abca34f 100644
--- a/service/tests/src/com/android/server/bluetooth/BluetoothServiceBinderTest.java
+++ b/service/tests/src/com/android/server/bluetooth/BluetoothServiceBinderTest.java
@@ -96,7 +96,7 @@ public class BluetoothServiceBinderTest {
     @Mock private AppOpsManager mAppOpsManager;
     @Mock private DevicePolicyManager mDevicePolicyManager;
 
-    private Context mContext =
+    private final Context mContext =
             spy(
                     new ContextWrapper(
                             InstrumentationRegistry.getInstrumentation().getTargetContext()));