diff options
| author | Amith Yamasani <yamasani@google.com> | 2014-08-19 17:03:41 -0700 |
|---|---|---|
| committer | Amith Yamasani <yamasani@google.com> | 2014-08-19 17:03:41 -0700 |
| commit | d1d7c022c6f83e836acb74eed1a5a201e495bd85 (patch) | |
| tree | d054d00adf8d0abe0afa8da1acca8cdc9a269506 /core/java/android/app/admin | |
| parent | 35f39b66606928b2fea06ebaa091a479bc28844a (diff) | |
| download | frameworks_base-d1d7c022c6f83e836acb74eed1a5a201e495bd85.zip frameworks_base-d1d7c022c6f83e836acb74eed1a5a201e495bd85.tar.gz frameworks_base-d1d7c022c6f83e836acb74eed1a5a201e495bd85.tar.bz2 | |
Rename restrictions API class and method
AbstractRestrictionsProvider -> android.service.restrictions.RestrictionsReceiver
requestPermission->onRequestPermission
Bug: 17006805
Change-Id: I03b1626d6abcd2ad739a55b60b54fdbf9810ceca
Diffstat (limited to 'core/java/android/app/admin')
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index f3f0c4d..053afb7 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -21,7 +21,6 @@ import android.annotation.SdkConstant.SdkConstantType; import android.annotation.SystemApi; import android.app.Activity; import android.app.admin.IDevicePolicyManager; -import android.content.AbstractRestrictionsProvider; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -39,6 +38,7 @@ import android.os.ServiceManager; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; +import android.service.restrictions.RestrictionsReceiver; import android.util.Log; import com.android.org.conscrypt.TrustedCertificateStore; @@ -3037,7 +3037,7 @@ public class DevicePolicyManager { * Only a profile owner can designate the restrictions provider. * @param admin Which {@link DeviceAdminReceiver} this request is associated with. * @param provider The component name of the service that implements - * {@link AbstractRestrictionsProvider}. If this param is null, + * {@link RestrictionsReceiver}. If this param is null, * it removes the restrictions provider previously assigned. */ public void setRestrictionsProvider(ComponentName admin, ComponentName provider) { |