commit e2a5e86c9f14debc8412741b68672f9432cae5b2
author David 'Digit' Turner <digit@google.com> Mon Jan 17 00:32:33 2011 +0100
committer David 'Digit' Turner <digit@google.com> Mon Jan 17 01:10:21 2011 +0100
tree bcfb61e9c79af8b9c1bc8111b53db4bdfa0f8d23
parent 783e6c8b3ba7eecac3bdd796b53a1293f9cb1be4

SystemServer: Do not register null BlueTooth service in the emulator

Because registering a null service generates an exception. See bug 3356000

Change-Id: Id7b4af815942e498d750c1b7a412d5ee26b61ad4

services/java/com/android/server/SystemServer.java

diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 95534e3..c0fea95 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -204,11 +204,9 @@
             // TODO: Use a more reliable check to see if this product should
             // support Bluetooth - see bug 988521
             if (SystemProperties.get("ro.kernel.qemu").equals("1")) {
-                Slog.i(TAG, "Registering null Bluetooth Service (emulator)");
-                ServiceManager.addService(BluetoothAdapter.BLUETOOTH_SERVICE, null);
+                Slog.i(TAG, "No Bluetooh Service (emulator)");
             } else if (factoryTest == SystemServer.FACTORY_TEST_LOW_LEVEL) {
-                Slog.i(TAG, "Registering null Bluetooth Service (factory test)");
-                ServiceManager.addService(BluetoothAdapter.BLUETOOTH_SERVICE, null);
+                Slog.i(TAG, "No Bluetooth Service (factory test)");
             } else {
                 Slog.i(TAG, "Bluetooth Service");
                 bluetooth = new BluetoothService(context);