From 14e61084aef0fab416fa6373de536ea5af61edeb Mon Sep 17 00:00:00 2001 From: Alex Dadukin Date: Mon, 9 Jan 2023 13:57:44 +0000 Subject: Replace usage of deprecated BluetoothAdapter API in BluetoothRouteProvider Bug: b/255495104 Test: atest SystemMediaRouter2Test Change-Id: I681f6a8fca2cfc85d1f17b6da2e4886b94788635 --- .../core/java/com/android/server/media/BluetoothRouteProvider.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/media/BluetoothRouteProvider.java b/services/core/java/com/android/server/media/BluetoothRouteProvider.java index 8182fe92ff2c..d0679449b944 100644 --- a/services/core/java/com/android/server/media/BluetoothRouteProvider.java +++ b/services/core/java/com/android/server/media/BluetoothRouteProvider.java @@ -27,6 +27,7 @@ import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothHearingAid; import android.bluetooth.BluetoothLeAudio; +import android.bluetooth.BluetoothManager; import android.bluetooth.BluetoothProfile; import android.content.BroadcastReceiver; import android.content.Context; @@ -91,7 +92,9 @@ class BluetoothRouteProvider { Objects.requireNonNull(context); Objects.requireNonNull(listener); - BluetoothAdapter btAdapter = BluetoothAdapter.getDefaultAdapter(); + BluetoothManager bluetoothManager = (BluetoothManager) + context.getSystemService(Context.BLUETOOTH_SERVICE); + BluetoothAdapter btAdapter = bluetoothManager.getAdapter(); if (btAdapter == null) { return null; } -- cgit v1.2.3-59-g8ed1b