Merge "VPN: cancel always-on notification with new id" into oc-dev

am: 4286c5768d Change-Id: I97138fb1b0418a74de0ea41c191f6b9968ab947c
2017-04-10 12:53:29 +00:00
parent 0a6fd9847c 4286c5768d
commit 5744ea2c0d
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/connectivity/Vpn.java
+++ b/services/core/java/com/android/server/connectivity/Vpn.java
@@ -1313,7 +1313,7 @@ public class Vpn {
        try {
            final NotificationManager notificationManager = NotificationManager.from(mContext);
            if (!visible) {
-                notificationManager.cancelAsUser(TAG, 0, user);
+                notificationManager.cancelAsUser(TAG, SystemMessage.NOTE_VPN_DISCONNECTED, user);
                return;
            }
            final Intent intent = new Intent(Settings.ACTION_VPN_SETTINGS);