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

Commit dab9d744 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Do not start VrManagerService if VR is not supported"

parents 0cef692a af1eda26

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();