2 files changed, 84 insertions, 8 deletions
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;
+      }
     }
 
     /**
diff --git a/framework/java/android/bluetooth/BluetoothFrameworkInitializer.java b/framework/java/android/bluetooth/BluetoothFrameworkInitializer.java
new file mode 100644
index 0000000000..3faf2ce3f6
--- /dev/null
+++ b/framework/java/android/bluetooth/BluetoothFrameworkInitializer.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package android.bluetooth;
+
+import android.annotation.NonNull;
+import android.annotation.SystemApi;
+import android.annotation.SystemApi.Client;
+import android.app.SystemServiceRegistry;
+import android.content.Context;
+import android.os.BluetoothServiceManager;
+
+/**
+ * Class for performing registration for Bluetooth service.
+ *
+ * @hide
+ */
+@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
+public class BluetoothFrameworkInitializer {
+  private BluetoothFrameworkInitializer() {}
+
+  private static volatile BluetoothServiceManager sBluetoothServiceManager;
+
+  /**
+   * Sets an instance of {@link BluetoothServiceManager} that allows
+   * the bluetooth mainline module to register/obtain bluetooth binder services. This is called
+   * by the platform during the system initialization.
+   *
+   * @param bluetoothServiceManager instance of {@link BluetoothServiceManager} that allows
+   * the bluetooth mainline module to register/obtain bluetoothd binder services.
+   */
+  public static void setBluetoothServiceManager(
+      @NonNull BluetoothServiceManager bluetoothServiceManager) {
+    if (sBluetoothServiceManager != null) {
+      throw new IllegalStateException("setBluetoothServiceManager called twice!");
+    }
+
+    if (bluetoothServiceManager == null) {
+      throw new NullPointerException("bluetoothServiceManager is null");
+    }
+
+    sBluetoothServiceManager = bluetoothServiceManager;
+  }
+
+  /** @hide */
+  public static BluetoothServiceManager getBluetoothServiceManager() {
+    return sBluetoothServiceManager;
+  }
+
+  /**
+   * Called by {@link SystemServiceRegistry}'s static initializer and registers BT service
+   * to {@link Context}, so that {@link Context#getSystemService} can return them.
+   *
+   * @throws IllegalStateException if this is called from anywhere besides
+   * {@link SystemServiceRegistry}
+   */
+  public static void registerServiceWrappers() {
+    SystemServiceRegistry.registerContextAwareService(Context.BLUETOOTH_SERVICE,
+        BluetoothManager.class, context -> new BluetoothManager(context));
+  }
+}