summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Robert Ly <robertly@google.com> 2011-05-04 17:02:26 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2011-05-04 17:02:26 -0700
commit796ba68b73fa93ae290cf85b264183ffcfa45eba (patch)
tree28f057ae10718b8ba323171ea00fc8e19c1556a5
parent5673c13b51bc4719d9a1afceb1aeb4743e86e230 (diff)
parent2246bc665d09e8f8e1dc35702fbe76e8bb270d56 (diff)
am 2246bc66: am 7157b7c3: Merge "doc change: a misplaced link removed" into honeycomb-mr1
* commit '2246bc665d09e8f8e1dc35702fbe76e8bb270d56': doc change: a misplaced link removed
-rw-r--r--docs/html/guide/topics/usb/accessory.jd6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/html/guide/topics/usb/accessory.jd b/docs/html/guide/topics/usb/accessory.jd
index 7638e3091d17..b0f488170c06 100644
--- a/docs/html/guide/topics/usb/accessory.jd
+++ b/docs/html/guide/topics/usb/accessory.jd
@@ -50,9 +50,9 @@ page.title=USB Accessory
</div>
</div>
- <p><a href="http://accessories.android.com/demokit">USB accessory mode allows users to connect
+ <p>USB accessory mode allows users to connect
USB host hardware specifically designed for Android-powered devices. The accessories must adhere
- to the Android accessory protocol outlined in</a> <a href=
+ to the Android accessory protocol outlined in the <a href=
"http://accessories.android.com/demokit">Android Accessory Development Kit</a> documentation.
This allows Android-powered devices that cannot act as a USB host to still interact with USB
hardware. When an Android-powered device is in USB accessory mode, the attached Android USB
@@ -445,7 +445,7 @@ BroadcastReceiver mUsbReceiver = new BroadcastReceiver() {
public void onReceive(Context context, Intent intent) {
String action = intent.getAction();
- if (UsbManager.ACTION_USB_ACCESSORY_DETACHED.equals(action)) {
+ if (UsbManager.ACTION_USB_ACCESSORY_DETACHED.equals(action)) {
UsbAccessory accessory = (UsbAccessory)intent.getParcelableExtra(UsbManager.EXTRA_ACCESSORY);
if (accessory != null) {
// call your method that cleans up and closes communication with the accessory