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

am 414ea81e: Merge "Ensure notifications are sent when locking/unlocking location share" into lmp-mr1-dev

Browse Source 
* commit '414ea81ea364d7b961cbfb885c30729595e3a7b2':
  Ensure notifications are sent when locking/unlocking location share
This commit is contained in:
Zoltan Szatmary-Ban
2015-01-26 10:41:00 +00:00
committed by Android Git Automerger
parent b0b28059b0 414ea81ea3
commit 059b8ab6a9
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -4893,6 +4893,19 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
} }
} }
mUserManager.setUserRestriction(key, enabled, user); mUserManager.setUserRestriction(key, enabled, user);
if (enabled != alreadyRestricted) {
if (UserManager.DISALLOW_SHARE_LOCATION.equals(key)) {
// Send out notifications however as some clients may want to reread the
// value which actually changed due to a restriction having been applied.
final String property = Settings.Secure.SYS_PROP_SETTING_VERSION;
long version = SystemProperties.getLong(property, 0) + 1;
SystemProperties.set(property, Long.toString(version));
final String name = Settings.Secure.LOCATION_PROVIDERS_ALLOWED;
Uri url = Uri.withAppendedPath(Settings.Secure.CONTENT_URI, name);
mContext.getContentResolver().notifyChange(url, null, true, userHandle);
}
}
} finally { } finally {
restoreCallingIdentity(id); restoreCallingIdentity(id);
} }