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

Commit e9d38658 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

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

Merge "Merge "Do not start VrManagerService if VR is not supported" into pi-dev am: 2667c1df" into pi-dev-plus-aosp
parents 340e84d3 04618d54

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

+4 −1
Original line number Diff line number Diff line
@@ -770,6 +770,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();
@@ -903,7 +906,7 @@ public final class SystemServer { 
                traceLog.traceEnd();

            }, START_HIDL_SERVICES);



            if (!isWatch) {

            if (!isWatch && enableVrService) {

                traceBeginAndSlog("StartVrManagerService");

                mSystemServiceManager.startService(VrManagerService.class);

                traceEnd();