Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3424b817 authored by Matthew Xie's avatar Matthew Xie Committed by Android Git Automerger
Browse files

am c5790636: Merge "Donot start Bluetooth Manager Service when bluetooth... 

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

* commit 'c5790636':
  Donot start Bluetooth Manager Service when bluetooth hardware feature is missing
parents 460778f1 c5790636

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

+4 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.content.ContentResolver; 
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 @@ class ServerThread extends Thread { 
                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);