Merge "Fix VR current component changes being ignored." (eef52f73) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/vr/VrManagerService.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -680,10 +680,10 @@ public class VrManagerService extends SystemService implements EnabledComponentC
	}		}
	}		}

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

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