summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Pavel Grafov <pgrafov@google.com> 2023-10-23 14:25:15 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-23 14:25:15 +0000
commitd259bd5f2a46d88cfca459c558a39b165d2f0691 (patch)
tree2f7fff040371b30052986645cc2c924b69fc08ab
parentd394d57659c118ff8a798badf310a3a92a6ef577 (diff)
parente85a23f37ddc9652b4be0848768b91d3d3bba312 (diff)
Merge "Correcting javadoc for setPersonalAppsSuspended" into main am: e85a23f37d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2719953 Change-Id: I1bc79911fbd5ac2b58d0c2d24bcafcd7c9ebaf6c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--core/java/android/app/admin/DevicePolicyManager.java5
1 files changed, 0 insertions, 5 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index 90d96160053c..9a70522c1406 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -16142,11 +16142,6 @@ public class DevicePolicyManager {
* Called by a profile owner of an organization-owned managed profile to suspend personal
* apps on the device. When personal apps are suspended the device can only be used for calls.
*
- * <p>When personal apps are suspended, an ongoing notification about that is shown to the user.
- * When the user taps the notification, system invokes {@link #ACTION_CHECK_POLICY_COMPLIANCE}
- * in the profile owner package. Profile owner implementation that uses personal apps suspension
- * must handle this intent.
- *
* @param admin Which {@link DeviceAdminReceiver} this request is associated with
* @param suspended Whether personal apps should be suspended.
* @throws IllegalStateException if the profile owner doesn't have an activity that handles