From 9b561aa6f875691957fa2e0937f90c548c7dc6ba Mon Sep 17 00:00:00 2001 From: Geoffrey Pitsch Date: Wed, 15 Feb 2017 09:35:38 -0500 Subject: [PATCH] Channels for Frameworks notifications Adapts all notifications used by system services to use channels. Channels are initialized by SystemServer after the NotificationService has started. Test: runtest systemui-notification Change-Id: I25c45293b786adb57787aeab4c2613c9d7c89dab --- .../server/connectivity/NetworkNotificationManager.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/services/core/java/com/android/server/connectivity/NetworkNotificationManager.java b/services/core/java/com/android/server/connectivity/NetworkNotificationManager.java index 68fe5053b5..83751a9c15 100644 --- a/services/core/java/com/android/server/connectivity/NetworkNotificationManager.java +++ b/services/core/java/com/android/server/connectivity/NetworkNotificationManager.java @@ -32,6 +32,7 @@ import android.widget.Toast; import com.android.internal.R; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import com.android.internal.notification.SystemNotificationChannels; import static android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET; import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR; @@ -187,7 +188,9 @@ public class NetworkNotificationManager { return; } - Notification.Builder builder = new Notification.Builder(mContext) + final String channelId = highPriority ? SystemNotificationChannels.NETWORK_ALERTS : + SystemNotificationChannels.NETWORK_STATUS; + Notification.Builder builder = new Notification.Builder(mContext, channelId) .setWhen(System.currentTimeMillis()) .setShowWhen(notifyType == NotificationType.NETWORK_SWITCH) .setSmallIcon(icon) @@ -198,10 +201,6 @@ public class NetworkNotificationManager { .setContentTitle(title) .setContentIntent(intent) .setLocalOnly(true) - .setPriority(highPriority ? - Notification.PRIORITY_HIGH : - Notification.PRIORITY_DEFAULT) - .setDefaults(highPriority ? Notification.DEFAULT_ALL : 0) .setOnlyAlertOnce(true); if (notifyType == NotificationType.NETWORK_SWITCH) {