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

am: 0814a41322 Change-Id: Ie80972ee57290bccb2170e4dd057875e1f2b045d
2017-07-25 14:13:57 +00:00
parent 6f56ee783f 0814a41322
commit a72dabc939
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/vr/VrManagerService.java
+++ b/services/core/java/com/android/server/vr/VrManagerService.java
@@ -785,7 +785,8 @@ public class VrManagerService extends SystemService implements EnabledComponentC
            }

            if ((calling != null || mPersistentVrModeEnabled)
-                    && !Objects.equals(calling, mCurrentVrModeComponent)) {
+                    && !Objects.equals(calling, mCurrentVrModeComponent)
+                    || mRunning2dInVr != running2dInVr) {
                sendUpdatedCaller = true;
            }
            mCurrentVrModeComponent = calling;