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

Commit c54aad61 authored by Fyodor Kupolov's avatar Fyodor Kupolov Committed by android-build-merger
Browse files

Merge "Call defuse even when restrictions bundle is empty" into nyc-dev 

am: f33e2da0

* commit 'f33e2da0':
  Call defuse even when restrictions bundle is empty

Change-Id: I2359e2cf9706211682ca2a4c79e62567532fa1f0
parents ba58fdee f33e2da0

services/core/java/com/android/server/pm/UserManagerService.java

+3 −1
Original line number Diff line number Diff line
@@ -2359,11 +2359,13 @@ public class UserManagerService extends IUserManager.Stub { 
    public void setApplicationRestrictions(String packageName, Bundle restrictions,

            int userId) {

        checkSystemOrRoot("set application restrictions");

        if (restrictions != null) {

            restrictions.setDefusable(true);

        }

        synchronized (mPackagesLock) {

            if (restrictions == null || restrictions.isEmpty()) {

                cleanAppRestrictionsForPackage(packageName, userId);

            } else {

                restrictions.setDefusable(true);

                // Write the restrictions to XML

                writeApplicationRestrictionsLP(packageName, restrictions, userId);

            }