diff options
| author | Nick Pelly <npelly@google.com> | 2009-10-08 17:36:19 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-08 17:36:19 -0700 |
| commit | 818cfce800fa53dcbe228d273fe815859bd86fd8 (patch) | |
| tree | cb952409b25c60f768d5d4d5c4b4f70fa9ba5256 /framework/java/android/bluetooth/BluetoothAdapter.java | |
| parent | 2fb4da9f711da342fa4fb4eb083c95176329c094 (diff) | |
| parent | 2076d39018a62610c1242870a63e1f057b1e076a (diff) | |
am 2076d390: BT API security audit: fix a couple of permission mistakes.
Merge commit '2076d39018a62610c1242870a63e1f057b1e076a' into eclair-mr2
* commit '2076d39018a62610c1242870a63e1f057b1e076a':
BT API security audit: fix a couple of permission mistakes.
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothAdapter.java')
| -rw-r--r-- | framework/java/android/bluetooth/BluetoothAdapter.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/framework/java/android/bluetooth/BluetoothAdapter.java b/framework/java/android/bluetooth/BluetoothAdapter.java index cc35b7da9f..5b34ef9ec0 100644 --- a/framework/java/android/bluetooth/BluetoothAdapter.java +++ b/framework/java/android/bluetooth/BluetoothAdapter.java @@ -569,6 +569,7 @@ public final class BluetoothAdapter { * <p>Applications can also register for {@link #ACTION_DISCOVERY_STARTED} * or {@link #ACTION_DISCOVERY_FINISHED} to be notified when discovery * starts or completes. + * <p>Requires {@link android.Manifest.permission#BLUETOOTH}. * * @return true if discovering */ @@ -582,6 +583,7 @@ public final class BluetoothAdapter { /** * Return the set of {@link BluetoothDevice} objects that are bonded * (paired) to the local adapter. + * <p>Requires {@link android.Manifest.permission#BLUETOOTH}. * * @return unmodifiable set of {@link BluetoothDevice}, or null on error */ |