From e1e6faad7b212d4042e74ca94f5428a346528ac0 Mon Sep 17 00:00:00 2001 From: Rubin Xu Date: Tue, 10 Mar 2015 10:51:59 +0000 Subject: Document behavior change of isUninstallBlocked() since L MR1 Bug: 17914630 Change-Id: I39ee2775c104e4dca7ca583b83deef0aa0e4d1e3 --- core/java/android/app/admin/DevicePolicyManager.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'core/java/android/app') diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 337bac5..a995835 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -3495,9 +3495,14 @@ public class DevicePolicyManager { /** * Check whether the current user has been blocked by device policy from uninstalling a package. * Requires the caller to be the profile owner if checking a specific admin's policy. + *

+ * Note: Starting from {@link android.os.Build.VERSION_CODES#LOLLIPOP_MR1}, the + * behavior of this API is changed such that passing null as the admin + * parameter will return if any admin has blocked the uninstallation. Before L MR1, passing + * null will cause a NullPointerException to be raised. * * @param admin The name of the admin component whose blocking policy will be checked, or null - * to check if any admin has blocked the uninstallation. + * to check if any admin has blocked the uninstallation. * @param packageName package to check. * @return true if uninstallation is blocked. */ -- cgit v1.1