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

Commit af1eda26 authored by Rick Yiu's avatar Rick Yiu
Browse files

Do not start VrManagerService if VR is not supported 

When VR mode is not supported by removing the feature of
android.hardware.vr.high_performance, do not start VrManagerService.
Otherwise, there will be undesired behavior, such as calling into
PowerHal/VrHal for VR hints.

Test: no undesired behavior observed
Bug: 112064298
Change-Id: I3e3c1f02c2fad958d8659d7957d005d25d823c3e
parent ddf1b4b4

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

+4 −1
Original line number Diff line number Diff line
@@ -794,6 +794,9 @@ public final class SystemServer { 
        boolean isWatch = context.getPackageManager().hasSystemFeature(

                PackageManager.FEATURE_WATCH);



        boolean enableVrService = context.getPackageManager().hasSystemFeature(

                PackageManager.FEATURE_VR_MODE_HIGH_PERFORMANCE);



        // For debugging RescueParty

        if (Build.IS_DEBUGGABLE && SystemProperties.getBoolean("debug.crash_system", false)) {

            throw new RuntimeException();
@@ -927,7 +930,7 @@ public final class SystemServer { 
                traceLog.traceEnd();

            }, START_HIDL_SERVICES);



            if (!isWatch) {

            if (!isWatch && enableVrService) {

                traceBeginAndSlog("StartVrManagerService");

                mSystemServiceManager.startService(VrManagerService.class);

                traceEnd();