Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix re-enabling alert window appop after leaving VR mode." into oc-dev

Browse Source
This commit is contained in:
Ruben Brunk
2017-04-24 22:49:07 +00:00
committed by Android (Google) Code Review
parent 06d84c3a86 2781b41c0e
commit d8f13bbc3d
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/vr/VrManagerService.java
View File

@@ -656,16 +656,12 @@ public class VrManagerService extends SystemService implements EnabledComponentC
false, mOverlayToken, null, oldUserId); false, mOverlayToken, null, oldUserId);
} }
if (!mVrModeEnabled) {
return;
}
// Apply the restrictions for the current user based on vr state // Apply the restrictions for the current user based on vr state
String[] exemptions = (exemptedPackage == null) ? new String[0] : String[] exemptions = (exemptedPackage == null) ? new String[0] :
new String[] { exemptedPackage }; new String[] { exemptedPackage };
appOpsManager.setUserRestrictionForUser(AppOpsManager.OP_SYSTEM_ALERT_WINDOW, appOpsManager.setUserRestrictionForUser(AppOpsManager.OP_SYSTEM_ALERT_WINDOW,
true, mOverlayToken, exemptions, newUserId); mVrModeEnabled, mOverlayToken, exemptions, newUserId);
} }
private void updateDependentAppOpsLocked(String newVrServicePackage, int newUserId, private void updateDependentAppOpsLocked(String newVrServicePackage, int newUserId,