commit 7196a6bff612d0f9c176e285ec8d43b14457b744
author Ruben Brunk <rubenbrunk@google.com> Wed Mar 22 15:43:24 2017 -0700
committer Ruben Brunk <rubenbrunk@google.com> Wed Mar 22 15:43:31 2017 -0700
tree 703e2b71201d02dc7bcaaf411e7e4a43f9b1490f
parent 2a1a66b547dce680c0aaa5179bd692e84cee517b

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

diff --git a/services/core/java/com/android/server/vr/VrManagerService.java b/services/core/java/com/android/server/vr/VrManagerService.java
index 5bcdd4c..e1df0ba 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 @@
                 }
             }
 
-            mCurrentVrModeComponent = calling;
             if (calling != null && !Objects.equals(calling, mCurrentVrModeComponent)) {
                 sendUpdatedCaller = true;
             }
+            mCurrentVrModeComponent = calling;
 
             if (mCurrentVrModeUser != userId) {
                 mCurrentVrModeUser = userId;