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

Commit f80d45bf authored by Kenny Root's avatar Kenny Root
Browse files

resolved conflicts for merge of 3424b817 to master 

Change-Id: Idb5bb208aa6aca66744fe6988029d22e739cc67b
parents 752625c8 3424b817

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;
@@ -346,6 +347,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 if (disableBluetooth) {

                Slog.i(TAG, "Bluetooth Service disabled by config");

            } else {