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

Commit 876fc254 authored by Hayden Gomes's avatar Hayden Gomes Committed by android-build-merger
Browse files

Merge "Removing emulator check for starting BluetoothService" into qt-dev am: 3d622b70 

am: 7de296f8

Change-Id: Iab905249a8cde19ccd5108f0cbb50d475daf4fd6
parents fa30afcd 7de296f8

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

+1 −6
Original line number Diff line number Diff line
@@ -1049,12 +1049,7 @@ public final class SystemServer { 
            mDisplayManagerService.windowManagerAndInputReady();

            traceEnd();



            // Skip Bluetooth if we have an emulator kernel

            // TODO: Use a more reliable check to see if this product should

            // support Bluetooth - see bug 988521

            if (isEmulator) {

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

            } else if (mFactoryTestMode == FactoryTest.FACTORY_TEST_LOW_LEVEL) {

            if (mFactoryTestMode == FactoryTest.FACTORY_TEST_LOW_LEVEL) {

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

            } else if (!context.getPackageManager().hasSystemFeature

                    (PackageManager.FEATURE_BLUETOOTH)) {