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

Commit 6b1251f8 authored by Alex Sakhartchouk's avatar Alex Sakhartchouk
Browse files

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

One of the paths that sends these notifications incorrectly indicated
that a VR app was not running. Fix the callsite to include the current
VR component instead of null.

Bug: 38004624
Test: Launch VR app, verify null component is not sent to VR core
while it's running.

Change-Id: I0589ee51952a503bfddec214999ed5bce48715ba
parent 7415a594

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.

     */