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

Merge "Donot start Bluetooth Manager Service when bluetooth hardware feature is missing" into jb-mr2-dev

Browse Source
This commit is contained in:
Matthew Xie
2013-04-29 19:35:28 +00:00
committed by Android (Google) Code Review
parent 906e57d8c0 1dd01eb36b
commit c579063615
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,6 +23,7 @@ import android.content.ContentResolver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.pm.IPackageManager; import android.content.pm.IPackageManager;
import android.content.pm.PackageManager;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.media.AudioService; import android.media.AudioService;
import android.net.wifi.p2p.WifiP2pService; import android.net.wifi.p2p.WifiP2pService;
@@ -330,6 +331,9 @@ class ServerThread extends Thread {
Slog.i(TAG, "No Bluetooh Service (emulator)"); Slog.i(TAG, "No Bluetooh Service (emulator)");
} else if (factoryTest == SystemServer.FACTORY_TEST_LOW_LEVEL) { } else if (factoryTest == SystemServer.FACTORY_TEST_LOW_LEVEL) {
Slog.i(TAG, "No Bluetooth Service (factory test)"); 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 { } else {
Slog.i(TAG, "Bluetooth Manager Service"); Slog.i(TAG, "Bluetooth Manager Service");
bluetooth = new BluetoothManagerService(context); bluetooth = new BluetoothManagerService(context);