From b2875925783b21d587d862d80922cd2004b1f6b0 Mon Sep 17 00:00:00 2001
From: Rick Yiu <rickyiu@google.com>
Date: Wed, 12 Sep 2018 11:07:25 +0000
Subject: Revert "Revert "Do not start VrManagerService if VR is not
 supported""

This reverts commit f5d99fa7d93f82701c188c4048f0c2a5af122fae.

Bug: 112064298
Change-Id: Ib2b595f8f98a577af205d5169af28a185ef00f03
---
 services/java/com/android/server/SystemServer.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'services/java')

diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 0b6a33f8c013..c426ef33ee0e 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -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();
-- 
cgit v1.2.3-59-g8ed1b