From 483befe0b719e670fa760bd341f10000a62552de Mon Sep 17 00:00:00 2001 From: Rick Yiu Date: Wed, 12 Sep 2018 03:48:13 +0000 Subject: [PATCH] Revert "Revert "Add null check for vrManager"" This reverts commit 122d844516d980ff2f010be2d0f0ec63cc6ca588. Bug: 112064298 Change-Id: Id38ab76ed100358adc03d189373432c03471bcaf --- .../android/systemui/statusbar/phone/StatusBar.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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 7ec4db21b6945..7316c02dd2262 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -732,10 +732,12 @@ public class StatusBar extends SystemUI implements DemoMode, 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(