From 7196a6bff612d0f9c176e285ec8d43b14457b744 Mon Sep 17 00:00:00 2001
From: Ruben Brunk <rubenbrunk@google.com>
Date: Wed, 22 Mar 2017 15:43:24 -0700
Subject: [PATCH] Fix onCurrentVrActivityChanged callbacks.

Bug: 36503317

Test: Use controller in a 3P VR application.

Change-Id: I1b11785077183c719e19f4f496677dba79e42dab
---
 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 5bcdd4cd036e0..e1df0ba287e19 100644
--- a/services/core/java/com/android/server/vr/VrManagerService.java
+++ b/services/core/java/com/android/server/vr/VrManagerService.java
@@ -725,10 +725,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;