diff options
| author | 2016-03-10 19:19:07 +0000 | |
|---|---|---|
| committer | 2016-03-10 19:19:08 +0000 | |
| commit | ab750d283aca3dcfa8178589ca64e8be819f848b (patch) | |
| tree | ab12dcc32822ad9b63b28ae18e87b673a5352ccc | |
| parent | 9dea71ccfff224fc213b00303cc77b9d0e82333f (diff) | |
| parent | 871f3ebb56b5c9219ff3f9cf7bab98038a7b7a5a (diff) | |
Merge "Update docs to make suspend then uninstall clear." into nyc-dev
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 4 | ||||
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index af9705f91f9e..53a6351b36e6 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -3723,7 +3723,9 @@ public class DevicePolicyManager { * be hidden, it will not show up in recents, will not be able to show toasts or dialogs * or ring the device. * - * <p>The package must already be installed. + * <p>The package must already be installed. If the package is uninstalled while suspended + * the package will no longer be suspended. The admin can block this by using + * {@link #setUninstallBlocked}. * * @param admin The name of the admin component to check. * @param packageNames The package names to suspend or unsuspend. diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index f80f36292f55..e1e8a07310ac 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -5367,6 +5367,9 @@ public abstract class PackageManager { * will be hidden, the application will not show up in recents, will not be able to show * toasts or dialogs or ring the device. * + * <p>The package must already be installed. If the package is uninstalled while suspended + * the package will no longer be suspended. + * * @param packageNames The names of the packages to set the suspended status. * @param suspended If set to {@code true} than the packages will be suspended, if set to * {@code false} the packages will be unsuspended. |