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

Commit 3d622b70 authored by Hayden Gomes's avatar Hayden Gomes Committed by Android (Google) Code Review
Browse files

Merge "Removing emulator check for starting BluetoothService" into qt-dev

parents b3196e53 013a7f8d

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

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

            mDisplayManagerService.windowManagerAndInputReady();

            traceEnd();

            traceEnd();





            // Skip Bluetooth if we have an emulator kernel

            if (mFactoryTestMode == FactoryTest.FACTORY_TEST_LOW_LEVEL) {

            // 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) {

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

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

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

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

                    (PackageManager.FEATURE_BLUETOOTH)) {

                    (PackageManager.FEATURE_BLUETOOTH)) {