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

Commit ebb9fc30 authored by phweiss's avatar phweiss Committed by Philipp Weiß
Browse files

Decrease number of network logging notifications shown 

Now, network logging will show one notification when it is enabled
and one after the next reboot.

Bug: 36254499
Test: CTS Verifier > Managed Provisioning > Device Owner Tests
      > Network Logging UI

Change-Id: I60fc64e96ceb0ec0ae7ca832b74ac8b47e581be4
(cherry picked from commit 55dba53e)
parent 6d149bc9

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

+2 −2
Original line number 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 isNetworkLoggingEnabled = false; // Can only be set by a device owner.



        // one notification after enabling + 3 more after reboots

        static final int DEF_MAXIMUM_NETWORK_LOGGING_NOTIFICATIONS_SHOWN = 4;

        // one notification after enabling + one more after reboots

        static final int DEF_MAXIMUM_NETWORK_LOGGING_NOTIFICATIONS_SHOWN = 2;

        int numNetworkLoggingNotifications = 0;

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