OSDN Git Service

Merge changes from topics "policy_fixed_set_via_perm_controller", "protect-policy...
authorPhilip P. Moltmann <moltmann@google.com>
Fri, 22 Feb 2019 04:39:31 +0000 (04:39 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 22 Feb 2019 04:39:31 +0000 (04:39 +0000)
commit933c8e06e87216d010a538077e6122fa5ad6eaa5
tree651ea40cd27abab6bab519ea756b41105e3c392f
parente346f7530d01a835277b14def6cd9ad9241e0d7f
parent41df9f94aee658f53cf520c80d3ec67e2406a51a
Merge changes from topics "policy_fixed_set_via_perm_controller", "protect-policy-flags"

* changes:
  Ask Perm Controller to set policy-fixed perms
  Guard changing policy_fixed flag behind permission
api/current.txt
api/system-current.txt
core/java/android/app/admin/DevicePolicyManager.java
core/res/AndroidManifest.xml
services/core/java/com/android/server/pm/PackageManagerService.java
services/core/java/com/android/server/pm/permission/PermissionManagerService.java
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java