Merge "Bluetooth: Make notifications local-only"

am: 348a7085fa

Change-Id: I7de9c9c01f1f704399c1b594beafca5bc14ef8df

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

@@ -107,7 +107,8 @@ public final class BluetoothPairingService extends Service {
         Resources res = getResources();
         Notification.Builder builder = new Notification.Builder(this)
                 .setSmallIcon(android.R.drawable.stat_sys_data_bluetooth)
-                .setTicker(res.getString(R.string.bluetooth_notif_ticker));
+                .setTicker(res.getString(R.string.bluetooth_notif_ticker))
+                .setLocalOnly(true);
 
         PendingIntent pairIntent = PendingIntent.getActivity(this, 0,
                 getPairingDialogIntent(this, intent), PendingIntent.FLAG_ONE_SHOT);

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

@@ -165,6 +165,7 @@ public final class BluetoothPermissionRequest extends BroadcastReceiver {
                         .setDeleteIntent(PendingIntent.getBroadcast(context, 0, deleteIntent, 0))
                         .setColor(context.getColor(
                                 com.android.internal.R.color.system_notification_accent_color))
+                        .setLocalOnly(true)
                         .build();
 
                 notification.flags |= Notification.FLAG_NO_CLEAR; // Cannot be set with the builder.