From ec4d3e4e2380e7464ee7f65c7649e5cbc7f0a0ec Mon Sep 17 00:00:00 2001
From: Alex Sakhartchouk <alexst@google.com>
Date: Mon, 24 Jul 2017 22:12:39 -0400
Subject: Follow up to "Add modified API to send more information to VrCore"

Fixes corner case when the same component name first shows up as a
non VR activity, then again as VR.

Bug: 63709047
Test: Device launched to VR Home
Change-Id: I6f590185635cde06b0fba9f0e05ff6d6d586cfbb
---
 services/core/java/com/android/server/vr/VrManagerService.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/vr/VrManagerService.java b/services/core/java/com/android/server/vr/VrManagerService.java
index e73732872cd2..447d639f31b3 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 @@ 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;
-- 
cgit v1.2.3-59-g8ed1b