Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 627b78f4 authored by Scott Main's avatar Scott Main Committed by Android Git Automerger
Browse files

am 071360d1: cherrypick Change-Id: I0b44b8b11599ac94fd0ecac84dcb71725d69cd63... 

am 071360d1: cherrypick Change-Id: I0b44b8b11599ac94fd0ecac84dcb71725d69cd63 Doc change: Update min glibc version for linux.

* commit '071360d1':
  cherrypick Change-Id: I0b44b8b11599ac94fd0ecac84dcb71725d69cd63 Doc change: Update min glibc version for linux.
parents 178d5005 071360d1

docs/html/sdk/android-2.3-highlights.jd

+1 −1
Original line number Original line Diff line number Diff line
@@ -258,7 +258,7 @@ audio</strong></p> 
href="http://www.khronos.org/opensles/">Khronos OpenSL ES</a>, a standard API

href="http://www.khronos.org/opensles/">Khronos OpenSL ES</a>, a standard API

that gives applications access to powerful audio controls and effects from

that gives applications access to powerful audio controls and effects from

native code. Applications can use the API to manage audio devices and control

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

<p style="margin-top:1.25em;margin-bottom:.75em;"><strong>Native graphics

management</strong></p>

management</strong></p>

docs/html/sdk/android-2.3.jd

+2 −2
Original line number Original line Diff line number Diff line
@@ -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
@@ -747,7 +747,7 @@ 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

docs/html/sdk/requirements.jd

+4 −2
Original line number Original line Diff line number Diff line
@@ -8,8 +8,10 @@ Android applications using the Android SDK. </p> 
<ul>

<ul>

  <li>Windows XP (32-bit), Vista (32- or 64-bit), or Windows 7 (32- or 64-bit)</li>

  <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>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>

    <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. 

      <li>64-bit distributions must be capable of running 32-bit applications. 

      For information about how to add support for 32-bit applications, see

      For information about how to add support for 32-bit applications, see

      the <a href="installing.html#troubleshooting">Ubuntu Linux

      the <a href="installing.html#troubleshooting">Ubuntu Linux