Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 3612f087: Merge "SystemServer: Do not register null BlueTooth service in the emulator" into honeycomb

Browse Source 
* commit '3612f0870c4252a60b93332eadde780dc122a05b':
  SystemServer: Do not register null BlueTooth service in the emulator
This commit is contained in:
David 'Digit' Turner
2011-01-16 19:26:22 -08:00
committed by Android Git Automerger
parent fed9d654e9 3612f0870c
commit 5356487f8b
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/java/com/android/server/SystemServer.java
View File

@@ -204,11 +204,9 @@ class ServerThread extends Thread {
// 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);