Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 4286c5768d

Change-Id: I97138fb1b0418a74de0ea41c191f6b9968ab947c
This commit is contained in:
Charles He
2017-04-10 12:53:29 +00:00
committed by android-build-merger
parent 0a6fd9847c 4286c5768d
commit 5744ea2c0d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/connectivity/Vpn.java
View File

@@ -1313,7 +1313,7 @@ public class Vpn {
try { try {
final NotificationManager notificationManager = NotificationManager.from(mContext); final NotificationManager notificationManager = NotificationManager.from(mContext);
if (!visible) { if (!visible) {
notificationManager.cancelAsUser(TAG, 0, user); notificationManager.cancelAsUser(TAG, SystemMessage.NOTE_VPN_DISCONNECTED, user);
return; return;
} }
final Intent intent = new Intent(Settings.ACTION_VPN_SETTINGS); final Intent intent = new Intent(Settings.ACTION_VPN_SETTINGS);