Add DPM.getUserRestrictions()
This returns per-DO/PO restrictions.
Bug 23902097
Change-Id: I225c1b01444fe2f60e5a6674d327182cc9bb15dc
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index 9e9d949..aa8bf53 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -3635,6 +3635,28 @@
}
/**
+ * Called by a profile or device owner to get user restrictions set with
+ * {@link #addUserRestriction(ComponentName, String)}.
+ * <p>
+ * The target user may have more restrictions set by the system or other device owner / profile
+ * owner. To get all the user restrictions currently set, use
+ * {@link UserManager#getUserRestrictions()}.
+ *
+ * @param admin Which {@link DeviceAdminReceiver} this request is associated with.
+ */
+ public Bundle getUserRestrictions(@NonNull ComponentName admin) {
+ Bundle ret = null;
+ if (mService != null) {
+ try {
+ ret = mService.getUserRestrictions(admin);
+ } catch (RemoteException e) {
+ Log.w(TAG, "Failed talking with device policy service", e);
+ }
+ }
+ return ret == null ? new Bundle() : ret;
+ }
+
+ /**
* Called by profile or device owners to hide or unhide packages. When a package is hidden it
* is unavailable for use, but the data and actual package file remain.
*