Merge "Clean bluetooth code" into tm-qpr-dev am: 19278b9477
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20377860
Change-Id: I68469b235bf57c254cfc9d5aaa8580e4f1abd141
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/src/com/android/settings/bluetooth/Utils.java b/src/com/android/settings/bluetooth/Utils.java
index 24fe4e1..9aa363a 100644
--- a/src/com/android/settings/bluetooth/Utils.java
+++ b/src/com/android/settings/bluetooth/Utils.java
@@ -203,7 +203,7 @@
public static String findBluetoothPackageName(Context context)
throws NameNotFoundException {
// this activity will always be in the package where the rest of Bluetooth lives
- String sentinelActivity = "com.android.bluetooth.opp.BluetoothOppLauncherActivity";
+ final String sentinelActivity = "com.android.bluetooth.opp.BluetoothOppLauncherActivity";
PackageManager packageManager = context.createContextAsUser(UserHandle.SYSTEM, 0)
.getPackageManager();
String[] allPackages = packageManager.getPackagesForUid(BLUETOOTH_UID);
diff --git a/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceController.java b/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceController.java
index f1677f2..a1467c8 100644
--- a/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceController.java
+++ b/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceController.java
@@ -41,15 +41,13 @@
private int mDefaultMaxConnectedAudioDevices = 0;
- private final BluetoothManager mBluetoothManager;
-
public BluetoothMaxConnectedAudioDevicesPreferenceController(Context context) {
super(context);
- mBluetoothManager = context.getSystemService(BluetoothManager.class);
+ final BluetoothManager bluetoothManager = context.getSystemService(BluetoothManager.class);
mDefaultMaxConnectedAudioDevices =
- mBluetoothManager.getAdapter().getMaxConnectedAudioDevices();
+ bluetoothManager.getAdapter().getMaxConnectedAudioDevices();
}
@Override