OSDN Git Service

Merge "bindDeviceAdminService requires service to be proected by BIND_DEVICE_ADMIN...
authorTony Mak <tonymak@google.com>
Thu, 27 Apr 2017 10:37:39 +0000 (10:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 27 Apr 2017 10:37:39 +0000 (10:37 +0000)
commit60b2d05160e8daa4fef3d4f41041d9c4584dd797
tree8e99b5c69c429f308149754ca2e5c507deae29ee
parent4bd91904b2fa8630d51e2aecbb01998bdc658084
parent6fbfc059652bb50637c31f064c44ea657ce54f4a
Merge "bindDeviceAdminService requires service to be proected by BIND_DEVICE_ADMIN" into oc-dev am: f4362fda59
am: 6fbfc05965

Change-Id: I0f286d3247bf3d4f6cd30e51f363a20d4b950c46
core/java/android/app/admin/DevicePolicyManager.java
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java