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

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

Browse Source
This commit is contained in:
Fyodor Kupolov
2016-04-19 20:35:01 +00:00
committed by Android (Google) Code Review
parent 66e640d8b4 0d88d54c34
commit f33e2da037
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/pm/UserManagerService.java
View File

@@ -2359,11 +2359,13 @@ public class UserManagerService extends IUserManager.Stub {
public void setApplicationRestrictions(String packageName, Bundle restrictions, public void setApplicationRestrictions(String packageName, Bundle restrictions,
int userId) { int userId) {
checkSystemOrRoot("set application restrictions"); checkSystemOrRoot("set application restrictions");
if (restrictions != null) {
restrictions.setDefusable(true);
}
synchronized (mPackagesLock) { synchronized (mPackagesLock) {
if (restrictions == null || restrictions.isEmpty()) { if (restrictions == null || restrictions.isEmpty()) {
cleanAppRestrictionsForPackage(packageName, userId); cleanAppRestrictionsForPackage(packageName, userId);
} else { } else {
restrictions.setDefusable(true);
// Write the restrictions to XML // Write the restrictions to XML
writeApplicationRestrictionsLP(packageName, restrictions, userId); writeApplicationRestrictionsLP(packageName, restrictions, userId);
} }