Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7fe2a286 authored by Daniel Sandler's avatar Daniel Sandler Committed by android-build-merger
Browse files

Merge "Fix NPE when the vr manager isn\'t around at first." into nyc-dev am: 1e79be9f 

am: 8bd6f46e

* commit '8bd6f46e':
  Fix NPE when the vr manager isn't around at first.

Change-Id: Idb33323fb7affe6ebdce236deba857d0add5899d
parents 3db2fa7f 8bd6f46e

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;

    }