From 122d844516d980ff2f010be2d0f0ec63cc6ca588 Mon Sep 17 00:00:00 2001 From: Adrian Roos Date: Mon, 10 Sep 2018 18:03:44 +0200 Subject: [PATCH] Revert "Add null check for vrManager" This reverts commit 7a5a757c2b548411de77063e2eaf0b10e678bcde. Bug: 112064298 Change-Id: Ieda9c99dcaf3d577e385015bd42b93d36630ee0c --- .../android/systemui/statusbar/phone/StatusBar.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 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 7316c02dd2262..7ec4db21b6945 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -732,12 +732,10 @@ public class StatusBar extends SystemUI implements DemoMode, IVrManager vrManager = IVrManager.Stub.asInterface(ServiceManager.getService( Context.VR_SERVICE)); - if (vrManager != null) { - try { - vrManager.registerListener(mVrStateCallbacks); - } catch (RemoteException e) { - Slog.e(TAG, "Failed to register VR mode state listener: " + e); - } + try { + vrManager.registerListener(mVrStateCallbacks); + } catch (RemoteException e) { + Slog.e(TAG, "Failed to register VR mode state listener: " + e); } IWallpaperManager wallpaperManager = IWallpaperManager.Stub.asInterface(