commit 85843be89c179899adc5038ca94207ff9c42e135
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Mar 23 01:02:08 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 23 01:02:13 2017 +0000
tree 01aab576a755ad98e60387f36a4a80ea7ead757f
parent 93a094c37f548378576bb722145c5039f25a6927
parent 7196a6bff612d0f9c176e285ec8d43b14457b744

Merge "Fix onCurrentVrActivityChanged callbacks."

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;