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

Merge "Replace SystemNotificationChannels on Tethering" am: f5869fac5a am: 710e70e75c am: bbe891e66d

Browse Source 
Change-Id: I5a3450a4f865e467327c0708efd3ff121b3f9a13
This commit is contained in:
Automerger Merge Worker
2020-01-13 09:41:57 +00:00
parent 59b8f09638 f5869fac5a
commit e6fb39b6ca
2 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Tethering/src/com/android/server/connectivity/tethering/Tethering.java
View File

@@ -50,6 +50,7 @@ import static android.telephony.CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANG
import static android.telephony.SubscriptionManager.INVALID_SUBSCRIPTION_ID;
import android.app.Notification;
import android.app.NotificationChannel;
import android.app.NotificationManager;
import android.app.PendingIntent;
import android.bluetooth.BluetoothAdapter;
@@ -107,7 +108,6 @@ import androidx.annotation.Nullable;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.messages.nano.SystemMessageProto.SystemMessage;
import com.android.internal.notification.SystemNotificationChannels;
import com.android.internal.util.IndentingPrintWriter;
import com.android.internal.util.MessageUtils;
import com.android.internal.util.State;
@@ -692,6 +692,12 @@ public class Tethering {
if (notificationManager == null) {
return;
}
final NotificationChannel channel = new NotificationChannel(
"TETHERING_STATUS",
mContext.getResources().getString(R.string.notification_channel_tethering_status),
NotificationManager.IMPORTANCE_LOW);
notificationManager.createNotificationChannel(channel);
int icon = 0;
switch(id) {
case SystemMessage.NOTE_TETHER_USB:
@@ -735,12 +741,11 @@ public class Tethering {
}
if (mTetheredNotificationBuilder == null) {
mTetheredNotificationBuilder = new Notification.Builder(mContext,
SystemNotificationChannels.NETWORK_STATUS);
mTetheredNotificationBuilder = new Notification.Builder(mContext, channel.getId());
mTetheredNotificationBuilder.setWhen(0)
.setOngoing(true)
.setColor(mContext.getColor(
com.android.internal.R.color.system_notification_accent_color))
android.R.color.system_notification_accent_color))
.setVisibility(Notification.VISIBILITY_PUBLIC)
.setCategory(Notification.CATEGORY_STATUS);
}