diff options
author | Ruben Brunk <rubenbrunk@google.com> | 2017-04-24 12:07:17 -0700 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-05-24 17:14:54 +0000 |
commit | de7cc6b147e66c041bd54ace9c98c20d6ba170f2 (patch) | |
tree | 5ae795b9b77d75c1e918782d10744b47169410dd | |
parent | aa4edfe65d778bef89e47876db09cdd8f7462832 (diff) | |
download | base-de7cc6b147e66c041bd54ace9c98c20d6ba170f2.tar.gz |
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
(cherry picked from commit 2781b41c0eea94ededc0f216aee432838e4224c5)
-rw-r--r-- | services/core/java/com/android/server/vr/VrManagerService.java | 6 |
1 files changed, 1 insertions, 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 a9a6aa1000cf..14fe0e8f1d6c 100644 --- a/services/core/java/com/android/server/vr/VrManagerService.java +++ b/services/core/java/com/android/server/vr/VrManagerService.java @@ -539,16 +539,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, |