From dbe13e6ad28f08258455d9bc4406106d00efeee4 Mon Sep 17 00:00:00 2001 From: Roopa Sattiraju Date: Sat, 22 Jan 2022 10:07:29 -0800 Subject: Add FrameworkInitializer for Bluetooth Bug: 195146428 Test: Compile and bring up Change-Id: Ia78685566466abd877fc8f7c471061d5b1492d9a --- .../java/android/bluetooth/BluetoothAdapter.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'framework/java/android/bluetooth/BluetoothAdapter.java') diff --git a/framework/java/android/bluetooth/BluetoothAdapter.java b/framework/java/android/bluetooth/BluetoothAdapter.java index 28d7aaf994..f302da12a8 100644 --- a/framework/java/android/bluetooth/BluetoothAdapter.java +++ b/framework/java/android/bluetooth/BluetoothAdapter.java @@ -30,6 +30,7 @@ import android.annotation.SdkConstant.SdkConstantType; import android.annotation.SuppressLint; import android.annotation.SystemApi; //import android.app.PropertyInvalidatedCache; import android.bluetooth.BluetoothDevice.Transport; +import android.bluetooth.BluetoothFrameworkInitializer; import android.bluetooth.BluetoothProfile.ConnectionPolicy; import android.bluetooth.annotations.RequiresBluetoothAdvertisePermission; import android.bluetooth.annotations.RequiresBluetoothConnectPermission; @@ -804,14 +805,16 @@ public final class BluetoothAdapter { /** {@hide} */ public static BluetoothAdapter createAdapter(AttributionSource attributionSource) { - IBinder binder = ServiceManager.getService(BLUETOOTH_MANAGER_SERVICE); - if (binder != null) { - return new BluetoothAdapter(IBluetoothManager.Stub.asInterface(binder), - attributionSource); - } else { - Log.e(TAG, "Bluetooth binder is null"); - return null; - } + IBluetoothManager service = IBluetoothManager.Stub.asInterface( + BluetoothFrameworkInitializer.getBluetoothServiceManager() + .getBluetoothManagerServiceRegisterer() + .get()); + if (service != null) { + return new BluetoothAdapter(service, attributionSource); + } else { + Log.e(TAG, "Bluetooth service is null"); + return null; + } } /** -- cgit v1.2.3