Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d5c8261 authored by Alex Johnston's avatar Alex Johnston Committed by Automerger Merge Worker
Browse files

Merge "Update network logging delegation docs" into tm-dev am: f428adf2 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18475051



Change-Id: I9d2e707a26e23a731e5768f58b6a6e48f3b8a25c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2372d8e8 f428adf2

core/java/android/app/admin/DevicePolicyManager.java

+7 −4
Original line number Original line Diff line number Diff line
@@ -2515,7 +2515,8 @@ public class DevicePolicyManager { 
     * If another app already had delegated network logging access,

     * If another app already had delegated network logging access,

     * it will lose the delegation when a new app is delegated.

     * it will lose the delegation when a new app is delegated.

     *

     *

     * <p> Can only be granted by Device Owner or Profile Owner of a managed profile.

     * <p> Device Owner can grant this access since Android 10. Profile Owner of a managed profile

     * can grant this access since Android 12.

     */

     */

    public static final String DELEGATION_NETWORK_LOGGING = "delegation-network-logging";

    public static final String DELEGATION_NETWORK_LOGGING = "delegation-network-logging";
















@@ -13255,9 +13256,11 @@ public class DevicePolicyManager {









     * Called by a device owner, profile owner of a managed profile or delegated app with







     * Called by a device owner, profile owner of a managed profile or delegated app with











     * {@link #DELEGATION_NETWORK_LOGGING} to control the network logging feature.







     * {@link #DELEGATION_NETWORK_LOGGING} to control the network logging feature.











     *







     *











     * <p> Supported for a device owner from Android 8. Supported for a profile owner of a managed







     * <p> Supported for a device owner from Android 8 and a delegated app granted by a device











     * profile from Android 12. When network logging is enabled by a profile owner, the network logs







     * owner from Android 10. Supported for a profile owner of a managed profile and a delegated











     * will only include work profile network activity, not activity on the personal profile.







     * app granted by a profile owner from Android 12. When network logging is enabled by a














     * profile owner, the network logs will only include work profile network activity, not














     * activity on the personal profile.











     *







     *











     * <p> Network logs contain DNS lookup and connect() library call events. The following library







     * <p> Network logs contain DNS lookup and connect() library call events. The following library











     *     functions are recorded while network logging is active:







     *     functions are recorded while network logging is active: