am 6d95fc0a: docs for ESR: add docs to bluetooth explainin that discovery should...

Merge commit '6d95fc0a2ca910212a43c4547c0ef000659b72dc' into eclair

* commit '6d95fc0a2ca910212a43c4547c0ef000659b72dc':
  docs for ESR: add docs to bluetooth explainin that discovery should

diff --cc core/java/android/bluetooth/BluetoothAdapter.java
index bd5b07c,f8cf4f2..bf561ef
--- 1/core/java/android/bluetooth/BluetoothAdapter.java
--- 2/core/java/android/bluetooth/BluetoothAdapter.java
+++ b/core/java/android/bluetooth/BluetoothAdapter.java
@@@ -143,11 -143,11 +143,12 @@@ public final class BluetoothAdapter 
       * <p>Notification of the result of this activity is posted using the
       * {@link android.app.Activity#onActivityResult} callback. The
       * <code>resultCode</code>
 -     * 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.
       * <p>Applications can also listen for {@link #ACTION_SCAN_MODE_CHANGED}
-      * for global notification whenever the scan mode changes.
+      * for global notification whenever the scan mode changes. For example, an
+      * application can be notified when the device has ended discoverability.
       * <p>Requires {@link android.Manifest.permission#BLUETOOTH}
       */
      @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)