diff options
| author | Scott Main <smain@google.com> | 2010-12-14 16:43:41 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-12-14 16:43:41 -0800 |
| commit | bd819afe613600e71046a52b46850a3f8fd830c7 (patch) | |
| tree | 01f03c8e6972f43050b54cb3af4f64fe51d0b1f4 /docs/html/sdk | |
| parent | e56092d5c9e2da914ffe2faa6699df9f70f9d43c (diff) | |
| parent | 627b78f49d06cb9e317915c86e64906fc671343c (diff) | |
| download | frameworks_base-bd819afe613600e71046a52b46850a3f8fd830c7.zip frameworks_base-bd819afe613600e71046a52b46850a3f8fd830c7.tar.gz frameworks_base-bd819afe613600e71046a52b46850a3f8fd830c7.tar.bz2 | |
am 627b78f4: am 071360d1: cherrypick Change-Id: I0b44b8b11599ac94fd0ecac84dcb71725d69cd63 Doc change: Update min glibc version for linux.
* commit '627b78f49d06cb9e317915c86e64906fc671343c':
cherrypick Change-Id: I0b44b8b11599ac94fd0ecac84dcb71725d69cd63 Doc change: Update min glibc version for linux.
Diffstat (limited to 'docs/html/sdk')
| -rw-r--r-- | docs/html/sdk/android-2.3-highlights.jd | 2 | ||||
| -rw-r--r-- | docs/html/sdk/android-2.3.jd | 4 | ||||
| -rw-r--r-- | docs/html/sdk/requirements.jd | 6 |
3 files changed, 7 insertions, 5 deletions
diff --git a/docs/html/sdk/android-2.3-highlights.jd b/docs/html/sdk/android-2.3-highlights.jd index f60bf51..1a603af 100644 --- a/docs/html/sdk/android-2.3-highlights.jd +++ b/docs/html/sdk/android-2.3-highlights.jd @@ -258,7 +258,7 @@ audio</strong></p> href="http://www.khronos.org/opensles/">Khronos OpenSL ES</a>, a standard API that gives applications access to powerful audio controls and effects from native code. Applications can use the API to manage audio devices and control -low-latency audio input, output and processing directly from native code</p> +audio input, output, and processing directly from native code.</p> <p style="margin-top:1.25em;margin-bottom:.75em;"><strong>Native graphics management</strong></p> diff --git a/docs/html/sdk/android-2.3.jd b/docs/html/sdk/android-2.3.jd index 5438adc..5b4f17b 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 @@ -747,7 +747,7 @@ 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 diff --git a/docs/html/sdk/requirements.jd b/docs/html/sdk/requirements.jd index 3679d44..a359dad 100644 --- a/docs/html/sdk/requirements.jd +++ b/docs/html/sdk/requirements.jd @@ -8,12 +8,14 @@ Android applications using the Android SDK. </p> <ul> <li>Windows XP (32-bit), Vista (32- or 64-bit), or Windows 7 (32- or 64-bit)</li> <li>Mac OS X 10.5.8 or later (x86 only)</li> - <li>Linux (tested on Linux Ubuntu Hardy Heron and Lucid Lynx) + <li>Linux (tested on Ubuntu Linux, Lucid Lynx) <ul> + <li>GNU C Library (glibc) 2.11 or later is required.</li> + <li>On Ubuntu Linux, Lucid Lynx or later release is required.</li> <li>64-bit distributions must be capable of running 32-bit applications. For information about how to add support for 32-bit applications, see the <a href="installing.html#troubleshooting">Ubuntu Linux -installation notes</a>.</li> + installation notes</a>.</li> </ul> </li> </ul> |