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

Commit 34196187 authored by Jaikumar Ganesh's avatar Jaikumar Ganesh Committed by Matthew Xie
Browse files

Remove BT references from System Server. 

Change-Id: Icfdb3e140aa35174a8b70da57472a1bf2bd0143b

Conflicts:

	services/java/com/android/server/SystemServer.java
parent 9773ebb7

core/jni/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -228,7 +228,6 @@ LOCAL_C_INCLUDES += \ 
	external/dbus \

	system/bluetooth/bluez-clean-headers

LOCAL_CFLAGS += -DHAVE_BLUETOOTH

LOCAL_SHARED_LIBRARIES += libbluedroid libdbus

endif



LOCAL_SHARED_LIBRARIES += \

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

+3 −19
Original line number Diff line number Diff line
@@ -36,8 +36,6 @@ import android.os.StrictMode; 
import android.os.SystemClock;

import android.os.SystemProperties;

import android.provider.Settings;

import android.server.BluetoothA2dpService;

import android.server.BluetoothService;

import android.server.search.SearchManagerService;

import android.service.dreams.DreamManagerService;

import android.util.DisplayMetrics;
@@ -130,8 +128,6 @@ class ServerThread extends Thread { 
        IPackageManager pm = null;

        Context context = null;

        WindowManagerService wm = null;

        BluetoothService bluetooth = null;

        BluetoothA2dpService bluetoothA2dp = null;

        DockObserver dock = null;

        UsbService usb = null;

        SerialService serial = null;
@@ -245,23 +241,11 @@ class ServerThread extends Thread { 
            } else if (factoryTest == SystemServer.FACTORY_TEST_LOW_LEVEL) {

                Slog.i(TAG, "No Bluetooth Service (factory test)");

            } else {

                Slog.i(TAG, "Bluetooth Service");

                bluetooth = new BluetoothService(context);

                ServiceManager.addService(BluetoothAdapter.BLUETOOTH_SERVICE, bluetooth);

                bluetooth.initAfterRegistration();



                if (!"0".equals(SystemProperties.get("system_init.startaudioservice"))) {

                    bluetoothA2dp = new BluetoothA2dpService(context, bluetooth);

                    ServiceManager.addService(BluetoothA2dpService.BLUETOOTH_A2DP_SERVICE,

                                              bluetoothA2dp);

                    bluetooth.initAfterA2dpRegistration();

                }



                //TODO(BT): Start BT services and turn on if needed.

                int airplaneModeOn = Settings.System.getInt(mContentResolver,

                        Settings.System.AIRPLANE_MODE_ON, 0);

                int bluetoothOn = Settings.Secure.getInt(mContentResolver,

                    Settings.Secure.BLUETOOTH_ON, 0);

                if (bluetoothOn != 0) {

                    bluetooth.enable();

                }

            }



        } catch (RuntimeException e) {