diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-09-14 20:00:22 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-09-14 20:00:22 +0000 |
| commit | 723438885d4e751e85366cfee26d54fb66d990ec (patch) | |
| tree | 488fb59dd29d34d191a0da1a5a6c5a406fea71a9 /services/java/com/android/server/SystemServer.java | |
| parent | 85b5bf530903e5a0b803a810773e2052aafa64c2 (diff) | |
| parent | b2875925783b21d587d862d80922cd2004b1f6b0 (diff) | |
Merge "Revert "Revert "Do not start VrManagerService if VR is not supported"""
Diffstat (limited to 'services/java/com/android/server/SystemServer.java')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index bb08345b2fe1..005822c9e210 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -797,6 +797,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(); @@ -930,7 +933,7 @@ public final class SystemServer { traceLog.traceEnd(); }, START_HIDL_SERVICES); - if (!isWatch) { + if (!isWatch && enableVrService) { traceBeginAndSlog("StartVrManagerService"); mSystemServiceManager.startService(VrManagerService.class); traceEnd(); |