Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am e9123960: cherrypick Change-Id: I00fd449b1daf5b75d6a051af46bfa6e45d131708 docs: misc doc fixes

Browse Source 
* commit 'e9123960764d7b2e94fb0d68aae21fccc472abcd':
  cherrypick Change-Id: I00fd449b1daf5b75d6a051af46bfa6e45d131708 docs: misc doc fixes
This commit is contained in:
Scott Main
2010-12-14 16:48:38 -08:00
committed by Android Git Automerger
parent a925b6a64c e912396076
commit 84bf9bc70f
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/html/guide/topics/manifest/uses-feature-element.jd
View File

@@ -339,7 +339,7 @@ the feature as shown below.</p>
<p class="caution">It's important to understand that the permissions that you <p class="caution">It's important to understand that the permissions that you
request in <code>&lt;uses-permission&gt;</code> elements can directly affect how request in <code>&lt;uses-permission&gt;</code> elements can directly affect how
Android Market filters your application. The reference section <a 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 below, lists the full set of permissions that imply feature requirements and
therefore trigger filtering.</p> therefore trigger filtering.</p>

8
docs/html/sdk/android-2.3.jd
View File

@@ -124,7 +124,7 @@ in {@sdkPlatformVersion}, including new features and changes in the framework
API since the previous version.</p> 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 <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 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> &mdash; Allows an application to use <li><code>android.permission.USE_SIP</code> &mdash; Allows an application to use
the {@link android.net.sip SIP API} to make or receive internet calls. the {@link android.net.sip SIP API} to make or receive internet calls.
<li><code>android.permission.NFC</code> &mdash; Allows an application to use the <li><code>android.permission.NFC</code> &mdash; 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> </ul>
<h3 id="feature_constants">New Feature Constants</h3> <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} <li>{@link android.content.pm.PackageManager#FEATURE_SIP android.software.sip}
&mdash; The application uses the SIP API on the device.</li> &mdash; The application uses the SIP API on the device.</li>
<li>{@link android.content.pm.PackageManager#FEATURE_SIP_VOIP <li>{@link android.content.pm.PackageManager#FEATURE_SIP_VOIP
android.software.sip.voip} &mdash; The application uses a SIP-based VOIP android.software.sip.voip} &mdash; The application uses a SIP-based VoIP
service on the device.</li> service on the device.</li>
<li>{@link <li>{@link
android.content.pm.PackageManager#FEATURE_TOUCHSCREEN_MULTITOUCH_JAZZHAND android.content.pm.PackageManager#FEATURE_TOUCHSCREEN_MULTITOUCH_JAZZHAND
android.hardware.touchscreen.multitouch.jazzhand} &mdash; The application uses android.hardware.touchscreen.multitouch.jazzhand} &mdash; The application uses
advanced multipoint multitouch capabilities on the device screen, for tracking 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> </ul>
<p>For full information about how to declare features and use them for <p>For full information about how to declare features and use them for