diff --git a/services/core/java/com/android/server/BluetoothService.java b/services/core/java/com/android/server/BluetoothService.java
new file mode 100644
index 0000000..73e8c52
--- /dev/null
+++ b/services/core/java/com/android/server/BluetoothService.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2015 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 com.android.server;
+
+import android.bluetooth.BluetoothAdapter;
+import android.content.Context;
+import android.util.Log;
+
+class BluetoothService extends SystemService {
+    private static final String TAG = "BluetoothService";
+    private BluetoothManagerService mBluetoothManagerService;
+
+    public BluetoothService(Context context) {
+        super(context);
+        mBluetoothManagerService = new BluetoothManagerService(context);
+    }
+
+    @Override
+    public void onStart() {
+        Log.d(TAG, "onStart: publishing BluetoothManagerService");
+        publishBinderService(BluetoothAdapter.BLUETOOTH_MANAGER_SERVICE, mBluetoothManagerService);
+    }
+
+    @Override
+    public void onBootPhase(int phase) {
+        if (phase == SystemService.PHASE_SYSTEM_SERVICES_READY) {
+            Log.d(TAG, "onBootPhase: PHASE_SYSTEM_SERVICES_READY");
+            mBluetoothManagerService.handleOnBootPhase();
+        }
+    }
+
+    @Override
+    public void onSwitchUser(int userHandle) {
+        Log.d(TAG, "onSwitchUser: switching to user " + userHandle);
+        mBluetoothManagerService.handleOnSwitchUser(userHandle);
+    }
+}