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

Commit 4d73fd57 authored by Ruben Brunk's avatar Ruben Brunk Committed by Android (Google) Code Review
Browse files

Merge "Fix VR component enforcement for "2D in 3D" apps." into oc-dev

parents bafe438d 666505ec

core/java/android/service/vr/VrListenerService.java

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ public abstract class VrListenerService extends Service { 
     * transition.</p>

     *

     * @param component the {@link ComponentName} of the VR activity that the system has

     *    switched to.

     *    switched to, or null if the system is displaying a 2D activity in VR compatibility mode.

     *

     * @see android.app.Activity#setVrModeEnabled

     * @see android.R.attr#enableVrMode

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

+2 −1
Original line number Diff line number Diff line
@@ -735,7 +735,8 @@ public class VrManagerService extends SystemService implements EnabledComponentC 
                }

            }



            if (calling != null && !Objects.equals(calling, mCurrentVrModeComponent)) {

            if ((calling != null || mPersistentVrModeEnabled)

                    && !Objects.equals(calling, mCurrentVrModeComponent)) {

                sendUpdatedCaller = true;

            }

            mCurrentVrModeComponent = calling;