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

Commit 444a123b 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 

am: 80e2f403

Change-Id: I848538c372bdb95ec4e13babe4dc1da7ac455ce9
parents 666be130 80e2f403

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,