commit 1dd01eb36b63d870d75aec189dd1718a1663c272
author Matthew Xie <mattx@google.com> Fri Apr 26 12:37:54 2013 -0700
committer Matthew Xie <mattx@google.com> Fri Apr 26 12:41:45 2013 -0700
tree c51b76f232cc1b4489d800fd282ed47b60c1c204
parent 22f6a60e62253436a4f7da1a5d59adc0f17534cc

Donot start Bluetooth Manager Service when bluetooth hardware feature is missing

bug 8374762

Change-Id: Iea06bd05e19eeddf3398ac446f3d6b80fce51283

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 681c21d..7994b56 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -23,6 +23,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.IPackageManager;
+import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.media.AudioService;
 import android.net.wifi.p2p.WifiP2pService;
@@ -330,6 +331,9 @@
                 Slog.i(TAG, "No Bluetooh Service (emulator)");
             } else if (factoryTest == SystemServer.FACTORY_TEST_LOW_LEVEL) {
                 Slog.i(TAG, "No Bluetooth Service (factory test)");
+            } else if (!context.getPackageManager().hasSystemFeature
+                       (PackageManager.FEATURE_BLUETOOTH)) {
+                Slog.i(TAG, "No Bluetooth Service (Bluetooth Hardware Not Present)");
             } else {
                 Slog.i(TAG, "Bluetooth Manager Service");
                 bluetooth = new BluetoothManagerService(context);