commit 8b09195f80b13b1428d35b2e04e10eb5a0872790
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Apr 22 01:49:50 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Apr 22 01:49:51 2017 +0000
tree 6ed4a156dc3e734d050542502a46ba4a25745919
parent 1c7e25d3b63eb7b287b77361bddd802c1a932c9d
parent 2432051bfda959469ec7ce0a75c41369f3ebff27

Merge "Add Bluetooth Pairing notifications to a channel" into oc-dev

src/com/android/settings/bluetooth/BluetoothPairingService.java

diff --git a/src/com/android/settings/bluetooth/BluetoothPairingService.java b/src/com/android/settings/bluetooth/BluetoothPairingService.java
index 980b150..58df919 100644
--- a/src/com/android/settings/bluetooth/BluetoothPairingService.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingService.java
@@ -17,6 +17,8 @@
 package com.android.settings.bluetooth;
 
 import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.NotificationChannel;
 import android.app.PendingIntent;
 import android.app.Service;
 import android.bluetooth.BluetoothDevice;
@@ -42,6 +44,9 @@
     private static final String ACTION_DISMISS_PAIRING =
             "com.android.settings.bluetooth.ACTION_DISMISS_PAIRING";
 
+    private static final String BLUETOOTH_NOTIFICATION_CHANNEL =
+            "bluetooth_notification_channel";
+
     private static final String TAG = "BluetoothPairingService";
 
     private BluetoothDevice mDevice;
@@ -94,6 +99,13 @@
 
     @Override
     public void onCreate() {
+      NotificationManager mgr = (NotificationManager)this
+         .getSystemService(Context.NOTIFICATION_SERVICE);
+      NotificationChannel notificationChannel = new NotificationChannel(
+         BLUETOOTH_NOTIFICATION_CHANNEL,
+         this.getString(R.string.bluetooth),
+         NotificationManager.IMPORTANCE_HIGH);
+      mgr.createNotificationChannel(notificationChannel);
     }
 
     @Override
@@ -105,7 +117,8 @@
         }
 
         Resources res = getResources();
-        Notification.Builder builder = new Notification.Builder(this)
+        Notification.Builder builder = new Notification.Builder(this,
+            BLUETOOTH_NOTIFICATION_CHANNEL)
                 .setSmallIcon(android.R.drawable.stat_sys_data_bluetooth)
                 .setTicker(res.getString(R.string.bluetooth_notif_ticker));