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 
am: f33e2da

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

Change-Id: I2359e2cf9706211682ca2a4c79e62567532fa1f0
This commit is contained in:
Fyodor Kupolov
2016-04-19 20:43:05 +00:00
committed by android-build-merger
parent ba58fdeeb5 f33e2da037
commit c54aad61e3
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,
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);
}