Merge "Fix NPE when the vr manager isn't around at first." into nyc-dev (1e79be9f) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/policy/ImmersiveModeConfirmation.java

+11 −6

Original line number	Diff line number	Diff line
		@@ -80,8 +80,6 @@ public class ImmersiveModeConfirmation {
		.getInteger(R.integer.config_immersive_mode_confirmation_panic);
		mWindowManager = (WindowManager)
		mContext.getSystemService(Context.WINDOW_SERVICE);
		mVrManager = (IVrManager) IVrManager.Stub.asInterface(
		ServiceManager.getService(VrManagerService.VR_MANAGER_BINDER_SERVICE));
		}

		private long getNavBarExitDuration() {
		@@ -121,9 +119,16 @@ public class ImmersiveModeConfirmation {

		private boolean getVrMode() {
		boolean vrMode = false;
		if (mVrManager == null) {
		// lazily grab this service since it may not be available at construction time
		mVrManager = (IVrManager) IVrManager.Stub.asInterface(
		ServiceManager.getService(VrManagerService.VR_MANAGER_BINDER_SERVICE));
		}
		if (mVrManager != null) {
		try {
		vrMode = mVrManager.getVrModeState();
		} catch (RemoteException ex) { }
		}
		return vrMode;
		}