commit eef52f7322cc9e17931eaf46621efefb66eedd4d
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Feb 25 00:55:56 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Feb 25 00:56:01 2017 +0000
tree c8a9b614f7a96d94757680036ed72dcc3da8200e
parent 4351d95225d2e6db409ac9ba507d0e494acb6bb1
parent 90a8a80a76e4c9786585291ac25421c503b05047

Merge "Fix VR current component changes being ignored."

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 d179ea7..3df4d24 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 @@
                 }
             }
 
-            mCurrentVrModeComponent = calling;
             if (calling != null && !Objects.equals(calling, mCurrentVrModeComponent)) {
                 sendUpdatedCaller = true;
             }
+            mCurrentVrModeComponent = calling;
 
             if (mCurrentVrModeUser != userId) {
                 mCurrentVrModeUser = userId;