commit 9b53851d58c6591a2bd75b4f98dd38cbf55e1662
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jul 25 13:54:25 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 25 13:54:25 2017 +0000
tree 4c4b632bf481d974ad64624c26fcd15ee4735996
parent f96573f8947ad4c33a355feb0d2b8dfeee2ab4b6
parent ec4d3e4e2380e7464ee7f65c7649e5cbc7f0a0ec

Merge "Follow up to "Add modified API to send more information to VrCore"" into oc-dr1-dev

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 e737328..447d639 100644
--- a/services/core/java/com/android/server/vr/VrManagerService.java
+++ b/services/core/java/com/android/server/vr/VrManagerService.java
@@ -779,7 +779,8 @@
             }
 
             if ((calling != null || mPersistentVrModeEnabled)
-                    && !Objects.equals(calling, mCurrentVrModeComponent)) {
+                    && !Objects.equals(calling, mCurrentVrModeComponent)
+                    || mRunning2dInVr != running2dInVr) {
                 sendUpdatedCaller = true;
             }
             mCurrentVrModeComponent = calling;