Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge "Do not start VrManagerService if VR is not supported" into pi-dev am: 2667c1dfa2" into pi-dev-plus-aosp

Browse Source
This commit is contained in:
Android Build Merger (Role)
2018-10-11 04:24:19 +00:00
committed by Android (Google) Code Review
parent 340e84d3c8 04618d5456
commit e9d3865896
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/java/com/android/server/SystemServer.java
View File

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