LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the comments left on aosp/1481197

Browse Source 
Bug: 172040168
Test: atest FrameworksNetTests
Test: Manual test NO_INTERNET, SIGN_IN, PARTIAL_CONNECTIVITY,
      VPN_ALWAYS_ON notifications.
Change-Id: Ibd05366481e6ddadf8b323335c2c35d40d340d0d
This commit is contained in:
lucaslin
2020-11-10 14:54:52 +08:00
parent 879f21b545
commit 64945ac754
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/connectivity/NetworkNotificationManager.java
View File

@@ -75,10 +75,11 @@ public class NetworkNotificationManager {
private static final boolean DBG = true; private static final boolean DBG = true;
// Notification channels used by ConnectivityService mainline module, it should be aligned with // Notification channels used by ConnectivityService mainline module, it should be aligned with
// SystemNotificationChannels. // SystemNotificationChannels so the channels are the same as the ones used as the system
public static final String NOTIFICATION_NETWORK_STATUS = "NETWORK_STATUS"; // server.
public static final String NOTIFICATION_NETWORK_ALERTS = "NETWORK_ALERTS"; public static final String NOTIFICATION_CHANNEL_NETWORK_STATUS = "NETWORK_STATUS";
public static final String NOTIFICATION_VPN = "VPN"; public static final String NOTIFICATION_CHANNEL_NETWORK_ALERTS = "NETWORK_ALERTS";
public static final String NOTIFICATION_CHANNEL_VPN = "VPN";
// The context is for the current user (system server) // The context is for the current user (system server)
private final Context mContext; private final Context mContext;
@@ -263,7 +264,7 @@ public class NetworkNotificationManager {
// the tag. // the tag.
final boolean hasPreviousNotification = previousNotifyType != null; final boolean hasPreviousNotification = previousNotifyType != null;
final String channelId = (highPriority && !hasPreviousNotification) final String channelId = (highPriority && !hasPreviousNotification)
? NOTIFICATION_NETWORK_ALERTS : NOTIFICATION_NETWORK_STATUS; ? NOTIFICATION_CHANNEL_NETWORK_ALERTS : NOTIFICATION_CHANNEL_NETWORK_STATUS;
Notification.Builder builder = new Notification.Builder(mContext, channelId) Notification.Builder builder = new Notification.Builder(mContext, channelId)
.setWhen(System.currentTimeMillis()) .setWhen(System.currentTimeMillis())
.setShowWhen(notifyType == NotificationType.NETWORK_SWITCH) .setShowWhen(notifyType == NotificationType.NETWORK_SWITCH)