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

Commit 1c35c0cb authored by phweiss's avatar phweiss Committed by android-build-merger
Browse files

Merge "Decrease number of network logging notifications shown" into oc-dev 

am: 11fbd214

Change-Id: I26d3966fc079e92fab3377595eec9f01bd17fb90
parents 81b6aae6 11fbd214

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -742,8 +742,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
        boolean forceEphemeralUsers = false; // Can only be set by a device owner.

        boolean forceEphemeralUsers = false; // Can only be set by a device owner.

        boolean isNetworkLoggingEnabled = false; // Can only be set by a device owner.

        boolean isNetworkLoggingEnabled = false; // Can only be set by a device owner.





        // one notification after enabling + 3 more after reboots

        // one notification after enabling + one more after reboots

        static final int DEF_MAXIMUM_NETWORK_LOGGING_NOTIFICATIONS_SHOWN = 4;

        static final int DEF_MAXIMUM_NETWORK_LOGGING_NOTIFICATIONS_SHOWN = 2;

        int numNetworkLoggingNotifications = 0;

        int numNetworkLoggingNotifications = 0;

        long lastNetworkLoggingNotificationTimeMs = 0; // Time in milliseconds since epoch

        long lastNetworkLoggingNotificationTimeMs = 0; // Time in milliseconds since epoch