Merge "Revert "Revert "Add null check for vrManager""" (033f4b95) · Commits · e / os / android_frameworks_base

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

+6 −4

Original line number	Diff line number	Diff line
		@@ -732,11 +732,13 @@ 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);
		}
		}

		IWallpaperManager wallpaperManager = IWallpaperManager.Stub.asInterface(
		ServiceManager.getService(Context.WALLPAPER_SERVICE));