From 82ed31c1efeb98acba60d79d1fc0a291b1440dc2 Mon Sep 17 00:00:00 2001
From: phweiss <phweiss@google.com>
Date: Mon, 9 Jan 2017 17:43:14 +0100
Subject: [PATCH] Dismiss network logging notification when disabling logging

Bug:34116213
Bug:29748723
Test: CTSVerifier in a separate CL.

Change-Id: Ie652505ff57665f626712c67837577833f1595d6
---
 .../android/server/devicepolicy/DevicePolicyManagerService.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index e5c8d02c4fd1f..642bb98b7335b 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -9974,6 +9974,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
                             + " service not being available yet.");
                 }
                 mNetworkLogger = null;
+                mInjector.getNotificationManager().cancel(NETWORK_LOGGING_NOTIFICATION_ID);
             }
         } finally {
             mInjector.binderRestoreCallingIdentity(callingIdentity);