diff options
| author | Scott Main <smain@google.com> | 2010-12-14 16:48:38 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-12-14 16:48:38 -0800 |
| commit | 84bf9bc70fba3e6adea473033c411ab145aa9698 (patch) | |
| tree | 6a0848f788d419ea21ac5fff11760be45d2d5661 /docs | |
| parent | a925b6a64c8137804547d5cfcd97415392d667b1 (diff) | |
| parent | e9123960764d7b2e94fb0d68aae21fccc472abcd (diff) | |
| download | frameworks_base-84bf9bc70fba3e6adea473033c411ab145aa9698.zip frameworks_base-84bf9bc70fba3e6adea473033c411ab145aa9698.tar.gz frameworks_base-84bf9bc70fba3e6adea473033c411ab145aa9698.tar.bz2 | |
am e9123960: cherrypick Change-Id: I00fd449b1daf5b75d6a051af46bfa6e45d131708 docs: misc doc fixes
* commit 'e9123960764d7b2e94fb0d68aae21fccc472abcd':
cherrypick Change-Id: I00fd449b1daf5b75d6a051af46bfa6e45d131708 docs: misc doc fixes
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/html/guide/topics/manifest/uses-feature-element.jd | 2 | ||||
| -rw-r--r-- | docs/html/sdk/android-2.3.jd | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/docs/html/guide/topics/manifest/uses-feature-element.jd b/docs/html/guide/topics/manifest/uses-feature-element.jd index a2a4001..5242126 100644 --- a/docs/html/guide/topics/manifest/uses-feature-element.jd +++ b/docs/html/guide/topics/manifest/uses-feature-element.jd @@ -339,7 +339,7 @@ the feature as shown below.</p> <p class="caution">It's important to understand that the permissions that you request in <code><uses-permission></code> elements can directly affect how Android Market filters your application. The reference section <a -href="#permissions-features">Permissions that Imply Feature Requirements</a>, +href="#permissions">Permissions that Imply Feature Requirements</a>, below, lists the full set of permissions that imply feature requirements and therefore trigger filtering.</p> diff --git a/docs/html/sdk/android-2.3.jd b/docs/html/sdk/android-2.3.jd index 9ef7847..f996fa2 100644 --- a/docs/html/sdk/android-2.3.jd +++ b/docs/html/sdk/android-2.3.jd @@ -124,7 +124,7 @@ in {@sdkPlatformVersion}, including new features and changes in the framework API since the previous version.</p> -<h3 id="sip">SIP-based VOIP</h3> +<h3 id="sip">SIP-based VoIP</h3> <p>The platform now includes a SIP protocol stack and framework API that lets developers build internet telephony applications. Using the API, applications can offer @@ -719,7 +719,7 @@ should require this permission.</li> <li><code>android.permission.USE_SIP</code> — Allows an application to use the {@link android.net.sip SIP API} to make or receive internet calls. <li><code>android.permission.NFC</code> — Allows an application to use the -{@link android.nfc NFC API} to make or receive internet calls.</li> +{@link android.nfc NFC API} to read NFC tags.</li> </ul> <h3 id="feature_constants">New Feature Constants</h3> @@ -748,13 +748,13 @@ gyroscope sensor.</li> <li>{@link android.content.pm.PackageManager#FEATURE_SIP android.software.sip} — The application uses the SIP API on the device.</li> <li>{@link android.content.pm.PackageManager#FEATURE_SIP_VOIP -android.software.sip.voip} — The application uses a SIP-based VOIP +android.software.sip.voip} — The application uses a SIP-based VoIP service on the device.</li> <li>{@link android.content.pm.PackageManager#FEATURE_TOUCHSCREEN_MULTITOUCH_JAZZHAND android.hardware.touchscreen.multitouch.jazzhand} — The application uses advanced multipoint multitouch capabilities on the device screen, for tracking -up to five points fully independently.</li> +five or more points fully independently.</li> </ul> <p>For full information about how to declare features and use them for |