From 87c969771bac1eda41a20c8e7be2b29ddb82499b Mon Sep 17 00:00:00 2001 From: Michael W Date: Fri, 15 Nov 2024 20:16:33 +0100 Subject: [PATCH] sdk: Use BluetoothManager.getAdapter() * BluetoothAdapter.getDefaultAdapter() is deprecated since sdk 31 * Also fixes wrong naming for mBluetoothAdapter which was local and thus didn't need the prefix "m" Change-Id: I003fe06fbd8958cde0fdd71d61710272e32a2ca5 --- .../platform/internal/ProfileManagerService.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lineage/lib/main/java/org/lineageos/platform/internal/ProfileManagerService.java b/lineage/lib/main/java/org/lineageos/platform/internal/ProfileManagerService.java index aa3b5684..f5949886 100644 --- a/lineage/lib/main/java/org/lineageos/platform/internal/ProfileManagerService.java +++ b/lineage/lib/main/java/org/lineageos/platform/internal/ProfileManagerService.java @@ -1,13 +1,13 @@ /* * SPDX-FileCopyrightText: 2011-2015 CyanogenMod Project - * SPDX-FileCopyrightText: 2017-2020 LineageOS Project + * SPDX-FileCopyrightText: 2017-2024 LineageOS Project * SPDX-License-Identifier: Apache-2.0 */ package org.lineageos.platform.internal; -import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothDevice; +import android.bluetooth.BluetoothManager; import android.content.ComponentName; import android.content.ServiceConnection; import android.database.ContentObserver; @@ -169,8 +169,8 @@ public class ProfileManagerService extends LineageSystemService { } } if (!selectProfile && blueToothTriggers.size() > 0) { - final BluetoothAdapter mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter(); - final Set pairedDevices = mBluetoothAdapter.getBondedDevices(); + final BluetoothManager btm = mContext.getSystemService(BluetoothManager.class); + final Set pairedDevices = btm.getAdapter().getBondedDevices(); final Set connectedBTDevices = new ArraySet<>(); for (BluetoothDevice device : pairedDevices) { if (device.isConnected()) connectedBTDevices.add(device.getAddress());