From 6bec9adffcfc7bb19d13121dac1451745c49f00d Mon Sep 17 00:00:00 2001
From: Roshan Pius <rpius@google.com>
Date: Mon, 9 Dec 2019 10:37:47 -0800
Subject: WifiService: Remove usage of NotificationChannel.setBlockableSystem

For non-signature apps, the default behavior is "blockable". So, this
@hide call is redundant.

For non-mainline devices, the network* channels used by wifi are the "common"
networking channels. On AOSP, they are created by
|SystemNotificationChannels| and marked as "blockable". So, unless the
OEM changes the AOSP version of |SystemNotificationChannels|, they will
continue to get the correct behavior.

Bug: 145921908
Test: Compiles
Change-Id: If705203d92a5f9ea850e42cf0e43efb970295927
---
 service/java/com/android/server/wifi/WifiService.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/service/java/com/android/server/wifi/WifiService.java b/service/java/com/android/server/wifi/WifiService.java
index 34f1a76b7..a6a32bb6e 100644
--- a/service/java/com/android/server/wifi/WifiService.java
+++ b/service/java/com/android/server/wifi/WifiService.java
@@ -94,7 +94,6 @@ public final class WifiService extends SystemService {
                 ctx.getResources().getString(
                         android.R.string.notification_channel_network_alerts),
                 NotificationManager.IMPORTANCE_HIGH);
-        networkAlertsChannel.setBlockableSystem(true);
         channelsList.add(networkAlertsChannel);
 
         final NotificationChannel networkAvailable = new NotificationChannel(
@@ -102,7 +101,6 @@ public final class WifiService extends SystemService {
                 ctx.getResources().getString(
                         android.R.string.notification_channel_network_available),
                 NotificationManager.IMPORTANCE_LOW);
-        networkAvailable.setBlockableSystem(true);
         channelsList.add(networkAvailable);
 
         nm.createNotificationChannels(channelsList);
-- 
cgit v1.2.3