Merge "Clean bluetooth code" into tm-qpr-dev

This commit is contained in:
TreeHugger Robot
2022-11-08 02:37:30 +00:00
committed by Android (Google) Code Review
2 changed files with 3 additions and 5 deletions

View File

@@ -203,7 +203,7 @@ public final class Utils {
public static String findBluetoothPackageName(Context context) public static String findBluetoothPackageName(Context context)
throws NameNotFoundException { throws NameNotFoundException {
// this activity will always be in the package where the rest of Bluetooth lives // 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) PackageManager packageManager = context.createContextAsUser(UserHandle.SYSTEM, 0)
.getPackageManager(); .getPackageManager();
String[] allPackages = packageManager.getPackagesForUid(BLUETOOTH_UID); String[] allPackages = packageManager.getPackagesForUid(BLUETOOTH_UID);

View File

@@ -41,15 +41,13 @@ public class BluetoothMaxConnectedAudioDevicesPreferenceController extends
private int mDefaultMaxConnectedAudioDevices = 0; private int mDefaultMaxConnectedAudioDevices = 0;
private final BluetoothManager mBluetoothManager;
public BluetoothMaxConnectedAudioDevicesPreferenceController(Context context) { public BluetoothMaxConnectedAudioDevicesPreferenceController(Context context) {
super(context); super(context);
mBluetoothManager = context.getSystemService(BluetoothManager.class); final BluetoothManager bluetoothManager = context.getSystemService(BluetoothManager.class);
mDefaultMaxConnectedAudioDevices = mDefaultMaxConnectedAudioDevices =
mBluetoothManager.getAdapter().getMaxConnectedAudioDevices(); bluetoothManager.getAdapter().getMaxConnectedAudioDevices();
} }
@Override @Override