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

Commit d98a4e50 authored by Pulkit Bhuwalka's avatar Pulkit Bhuwalka
Browse files

Remove outdated emulator check which causes BT to not start 

ro.kernel.qemu based check to determine whether Bluetooth should be
started or not was an old hack used when "features" was not available to
determine hardware availability. This was later fixed with the
hasSystemFeature check. However, the old check was not removed.

The presence of the old check causes Bluetooth to not start on Android
Things devices which have ro.kernel.qemu set for graphics usage. It's
also preferable to depend on the system API rather than on build
configs. Related CLs modify the emulator builds to correct the config in
builds.

Bug: 35361545
Change-Id: I219ce5e14709c76dcba43af4693093e985269d43
Test: Verified by launching bluetooth on local devices after removing
the old check. Also verified by booting up the emulator and verifying
that Bluetooth Services do not start.
parent 855889b0

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

+1 −8
Original line number Diff line number Diff line
@@ -557,8 +557,6 @@ public final class SystemServer { 
        boolean disableCameraService = SystemProperties.getBoolean("config.disable_cameraservice",

                false);



        boolean isEmulator = SystemProperties.get("ro.kernel.qemu").equals("1");



        try {

            Slog.i(TAG, "Reading configuration...");

            SystemConfig.getInstance();
@@ -645,12 +643,7 @@ public final class SystemServer { 
            // TODO: Use service dependencies instead.

            mDisplayManagerService.windowManagerAndInputReady();



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