commit ee1df63a727c737230858ffe37fdc98696786524
author Rick Yiu <rickyiu@google.com> Sat Sep 08 17:48:53 2018 +0800
committer Rick Yiu <rickyiu@google.com> Mon Sep 24 12:53:17 2018 +0800
tree 2e777f77d507bdcc7f9317b3d084d5d343099a47
parent a6a12cf2742bb3c23e1dd1c330193d4ea7539979

Add null check for vrManager

If VrManagerService is not started, vrManager will be null. Need
add check for it.

Test: system does not break if VrManagerService is not started
Bug: 116427118
Change-Id: I05ec75c73d11365e0b7bbaa603d0e96309d6fd1d
Merged-In: I05ec75c73d11365e0b7bbaa603d0e96309d6fd1d

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
index 7863465..08ebc26 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
@@ -759,10 +759,12 @@
 
         IVrManager vrManager = IVrManager.Stub.asInterface(ServiceManager.getService(
                 Context.VR_SERVICE));
-        try {
-            vrManager.registerListener(mVrStateCallbacks);
-        } catch (RemoteException e) {
-            Slog.e(TAG, "Failed to register VR mode state listener: " + e);
+        if (vrManager != null) {
+            try {
+                vrManager.registerListener(mVrStateCallbacks);
+            } catch (RemoteException e) {
+                Slog.e(TAG, "Failed to register VR mode state listener: " + e);
+            }
         }
 
         IWallpaperManager wallpaperManager = IWallpaperManager.Stub.asInterface(