From cdd2864eb340fe46a97f4991f3949db1196bdde8 Mon Sep 17 00:00:00 2001 From: Michael Chan Date: Thu, 5 Nov 2009 18:29:01 -0800 Subject: b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth --- core/java/android/bluetooth/BluetoothAdapter.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/core/java/android/bluetooth/BluetoothAdapter.java b/core/java/android/bluetooth/BluetoothAdapter.java index 3fc676b271f2..4684f455e95a 100644 --- a/core/java/android/bluetooth/BluetoothAdapter.java +++ b/core/java/android/bluetooth/BluetoothAdapter.java @@ -126,8 +126,9 @@ public final class BluetoothAdapter { *

Notification of the result of this activity is posted using the * {@link android.app.Activity#onActivityResult} callback. The * resultCode - * will be the duration (in seconds) of discoverability, or a negative - * value if the user rejected discoverability. + * will be the duration (in seconds) of discoverability or + * {@link android.app.Activity#RESULT_CANCELED} if the user rejected + * discoverability or an error has occurred. *

Applications can also listen for {@link #ACTION_SCAN_MODE_CHANGED} * for global notification whenever the scan mode changes. *

Requires {@link android.Manifest.permission#BLUETOOTH} @@ -153,8 +154,9 @@ public final class BluetoothAdapter { *

Notification of the result of this activity is posted using the * {@link android.app.Activity#onActivityResult} callback. The * resultCode - * will be negative if the user did not turn on Bluetooth, and non-negative - * if Bluetooth has been turned on. + * will be {@link android.app.Activity#RESULT_OK} if Bluetooth has been + * turned on or {@link android.app.Activity#RESULT_CANCELED} if the user + * has rejected the request or an error has occurred. *

Applications can also listen for {@link #ACTION_STATE_CHANGED} * for global notification whenever Bluetooth is turned on or off. *

Requires {@link android.Manifest.permission#BLUETOOTH} -- cgit v1.2.3-59-g8ed1b