From b844956d69de03632efccf914be725e5fbe60180 Mon Sep 17 00:00:00 2001 From: Ruben Brunk Date: Thu, 5 Oct 2017 13:30:47 -0700 Subject: [PATCH] Fix NPE in dumpsys logs. Bug: 67460310 Bug: 66967700 Test: adb shell dumpsys vrmanager Change-Id: I008717663dd5ae4fe99ca62f631794a56ca2eb12 --- services/core/java/com/android/server/vr/VrManagerService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/vr/VrManagerService.java b/services/core/java/com/android/server/vr/VrManagerService.java index f06f76dc9edbb..4dd98c6acdea3 100644 --- a/services/core/java/com/android/server/vr/VrManagerService.java +++ b/services/core/java/com/android/server/vr/VrManagerService.java @@ -582,7 +582,7 @@ public class VrManagerService extends SystemService implements EnabledComponentC pw.println("Persistent VR mode is currently: " + ((mPersistentVrModeEnabled) ? "enabled" : "disabled")); pw.println("Currently bound VR listener service: " - + ((mCurrentVrService == null) + + ((mCurrentVrCompositorService == null) ? "None" : mCurrentVrCompositorService.getComponent().flattenToString())); pw.println("Currently bound VR compositor service: " + ((mCurrentVrCompositorService == null)