OSDN Git Service

Merge "DPM.isProvisioningAllowed(ACTION_PROVISION_MANAGED_DEVICE) should return ...
authorGreg Plesur <plesur@google.com>
Thu, 13 Oct 2016 21:01:59 +0000 (21:01 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 13 Oct 2016 21:02:01 +0000 (21:02 +0000)
commit216ee1f0e76f6a36bebb5490c951db2a5513ae03
tree3d4d7691403e907933dceebc0890128eb1c58c29
parentd3ad5ce1477a08fe776ee6b7ba81b9832eb16aaa
parent35144049846e115b7d1e03fb6c935ed497d83cb2
Merge "DPM.isProvisioningAllowed(ACTION_PROVISION_MANAGED_DEVICE) should return 'false' for Wear devices after pairing/upgrade." into cw-f-dev
core/java/android/provider/Settings.java
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java