From 2781b41c0eea94ededc0f216aee432838e4224c5 Mon Sep 17 00:00:00 2001 From: Ruben Brunk Date: Mon, 24 Apr 2017 12:07:17 -0700 Subject: [PATCH] Fix re-enabling alert window appop after leaving VR mode. Bug: 37526753 Test: Check that system alert windows appear after leaving VR mode. Change-Id: I2942b2e2bd30308752367963b7ae896462811d2f --- .../core/java/com/android/server/vr/VrManagerService.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/services/core/java/com/android/server/vr/VrManagerService.java b/services/core/java/com/android/server/vr/VrManagerService.java index cc089184d2ed7..f5fa3523fec06 100644 --- a/services/core/java/com/android/server/vr/VrManagerService.java +++ b/services/core/java/com/android/server/vr/VrManagerService.java @@ -642,16 +642,12 @@ public class VrManagerService extends SystemService implements EnabledComponentC false, mOverlayToken, null, oldUserId); } - if (!mVrModeEnabled) { - return; - } - // Apply the restrictions for the current user based on vr state String[] exemptions = (exemptedPackage == null) ? new String[0] : new String[] { exemptedPackage }; appOpsManager.setUserRestrictionForUser(AppOpsManager.OP_SYSTEM_ALERT_WINDOW, - true, mOverlayToken, exemptions, newUserId); + mVrModeEnabled, mOverlayToken, exemptions, newUserId); } private void updateDependentAppOpsLocked(String newVrServicePackage, int newUserId,