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

Commit 7d8d9c49 authored by Alex Sakhartchouk's avatar Alex Sakhartchouk Committed by android-build-merger
Browse files

Merge "We notify VR Core when a 2D intent is running in VR in persistent... 

Merge "We notify VR Core when a 2D intent is running in VR in persistent mode." into oc-dev am: 13fb1d34
am: 11a2a509

Change-Id: Ie9c83935480672d997e356b815af9625dee967f6
parents 6ff052a5 11a2a509

services/core/java/com/android/server/vr/VrManagerService.java

+2 −2
Original line number Diff line number Diff line
@@ -368,7 +368,7 @@ public class VrManagerService extends SystemService implements EnabledComponentC 


            // There is an active service, update it if needed

            updateCurrentVrServiceLocked(mVrModeEnabled, mCurrentVrService.getComponent(),

                    mCurrentVrService.getUserId(), null);

                    mCurrentVrService.getUserId(), mCurrentVrModeComponent);

        }

    }
@@ -675,7 +675,7 @@ public class VrManagerService extends SystemService implements EnabledComponentC 
     * @param enabled new state for VR mode.

     * @param component new component to be bound as a VR listener.

     * @param userId user owning the component to be bound.

     * @param calling the component currently using VR mode, or null to leave unchanged.

     * @param calling the component currently using VR mode.

     *

     * @return {@code true} if the component/user combination specified is valid.

     */