PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Clean bluetooth code" into tm-qpr-dev am: 19278b9477 am: fec63bdb5b

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20377860

Change-Id: I6630576b731ff2c589b01520be45f55cf3f0e275
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-11-08 03:53:22 +00:00
committed by Automerger Merge Worker
parent 61d661feb9 fec63bdb5b
commit 26b806629d
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/bluetooth/Utils.java
View File

@@ -203,7 +203,7 @@ public final class Utils {
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);

6
src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceController.java
View File

@@ -41,15 +41,13 @@ public class BluetoothMaxConnectedAudioDevicesPreferenceController extends
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