Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80e2f403 authored by Ruben Brunk's avatar Ruben Brunk Committed by android-build-merger
Browse files

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

am: d8f13bbc

Change-Id: I30baa3eeaab4d8cdb189ab4d59c3272c6232f798
parents 2fd83ae9 d8f13bbc

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

+1 −5
Original line number Diff line number Diff line
@@ -656,16 +656,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,