Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 344405d8 authored by Ajay Panicker's avatar Ajay Panicker Committed by android-build-merger
Browse files

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

am: 8b09195f

Change-Id: Iced885cd7195ed48920667ef96c0cbbdec587466
parents a95fc0f0 8b09195f

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

+14 −1
Original line number Diff line number Diff line
@@ -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 @@ public final class BluetoothPairingService extends Service { 
    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 @@ public final class BluetoothPairingService extends Service { 


    @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 @@ public final class BluetoothPairingService extends Service { 
        }



        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));