From f14ff1c9ce37299c2fcef258a854acf79c026ccf Mon Sep 17 00:00:00 2001 From: kmccormick Date: Thu, 6 Jun 2013 11:14:57 -0700 Subject: [PATCH] Doc change: new Bluetooth LE doc Change-Id: Ib6d67497a9b4d54d13b4da8f1f9ee991bc5ef562 --- core/java/android/bluetooth/package.html | 13 +- docs/html/guide/guide_toc.cs | 15 +- .../guide/topics/connectivity/bluetooth-le.jd | 608 ++++++++++++++++++ .../guide/topics/connectivity/bluetooth.jd | 43 +- 4 files changed, 646 insertions(+), 33 deletions(-) create mode 100644 docs/html/guide/topics/connectivity/bluetooth-le.jd diff --git a/core/java/android/bluetooth/package.html b/core/java/android/bluetooth/package.html index ba75034555e2d..200a21b8acff1 100644 --- a/core/java/android/bluetooth/package.html +++ b/core/java/android/bluetooth/package.html @@ -1,15 +1,20 @@

Provides classes that manage Bluetooth functionality, such as scanning for -devices, connecting with devices, and managing data transfer between devices.

+devices, connecting with devices, and managing data transfer between devices. +The Bluetooth API supports both "Classic Bluetooth" and Bluetooth Low Energy.

-

For more information, see the -Bluetooth guide.

+

For more information about Classic Bluetooth, see the +Bluetooth guide. +For more information about Bluetooth Low Energy, see the + +Bluetooth Low Energy guide.

{@more}

The Bluetooth APIs let applications:

+

This document describes how to use Classic Bluetooth. Classic +Bluetooth is the right choice for more battery-intensive operations such as streaming +and communicating between Android devices. For Bluetooth devices with low power requirements, +Android 4.3 (API Level 18) introduces API support for Bluetooth Low Energy. To learn more, +see Bluetooth Low Energy.

The Basics

@@ -164,22 +163,18 @@ is, the internal service that runs a particular profile).

Bluetooth Permissions

-

In order to use Bluetooth features in your application, you need to declare -at least one of two Bluetooth permissions: {@link -android.Manifest.permission#BLUETOOTH} and {@link -android.Manifest.permission#BLUETOOTH_ADMIN}.

- -

You must request the {@link android.Manifest.permission#BLUETOOTH} permission -in order to perform any Bluetooth communication, such as requesting a -connection, accepting a connection, and transferring data.

- -

You must request the {@link android.Manifest.permission#BLUETOOTH_ADMIN} -permission in order to initiate device discovery or manipulate Bluetooth -settings. Most applications need this permission solely for the +

In order to use Bluetooth features in your application, you must declare +the Bluetooth permission {@link android.Manifest.permission#BLUETOOTH}. +You need this permission to perform any Bluetooth communication, +such as requesting a connection, accepting a connection, and transferring data.

+ +

If you want your app to initiate device discovery or manipulate Bluetooth +settings, you must also declare the {@link android.Manifest.permission#BLUETOOTH_ADMIN} +permission. Most applications need this permission solely for the ability to discover local Bluetooth devices. The other abilities granted by this permission should not be used, unless the application is a "power manager" that will modify Bluetooth settings upon user request. Note: If you -use {@link android.Manifest.permission#BLUETOOTH_ADMIN} permission, then must +use {@link android.Manifest.permission#BLUETOOTH_ADMIN} permission, then you must also have the {@link android.Manifest.permission#BLUETOOTH} permission.

Declare the Bluetooth permission(s) in your application manifest file. For