From 90a8a80a76e4c9786585291ac25421c503b05047 Mon Sep 17 00:00:00 2001
From: Zak Cohen <zakcohen@google.com>
Date: Fri, 24 Feb 2017 14:37:07 -0800
Subject: [PATCH] Fix VR current component changes being ignored.

Bug: 35723429
Test: built, run on device and verified that controller works
Change-Id: I7467f893ef313145d7aa555285dae60cb7ec3cf2
---
 services/core/java/com/android/server/vr/VrManagerService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/vr/VrManagerService.java b/services/core/java/com/android/server/vr/VrManagerService.java
index d179ea703d1ec..3df4d2432bf96 100644
--- a/services/core/java/com/android/server/vr/VrManagerService.java
+++ b/services/core/java/com/android/server/vr/VrManagerService.java
@@ -680,10 +680,10 @@ public class VrManagerService extends SystemService implements EnabledComponentC
                 }
             }
 
-            mCurrentVrModeComponent = calling;
             if (calling != null && !Objects.equals(calling, mCurrentVrModeComponent)) {
                 sendUpdatedCaller = true;
             }
+            mCurrentVrModeComponent = calling;
 
             if (mCurrentVrModeUser != userId) {
                 mCurrentVrModeUser = userId;