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

Commit 151d60c6 authored by Charles He's avatar Charles He Committed by android-build-merger
Browse files

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

am: 5744ea2c

Change-Id: Iffe87fb5e4bba4129e0d9109e73b11da01080e20
parents c4f821c1 5744ea2c

services/core/java/com/android/server/connectivity/Vpn.java

+1 −1
Original line number Diff line number Diff line
@@ -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);