Merge "Fix VR current component changes being ignored."

2017-02-25 00:55:56 +00:00
parent 4351d95225 90a8a80a76
commit eef52f7322
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/vr/VrManagerService.java
+++ b/services/core/java/com/android/server/vr/VrManagerService.java
@@ -680,10 +680,10 @@ public class VrManagerService extends SystemService implements EnabledComponentC
                }
            }

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

            if (mCurrentVrModeUser != userId) {
                mCurrentVrModeUser = userId;