commit ca0d46d9ffb79e3353628ac1ada94b7c75c0cfa1
author Glenn Kasten <gkasten@google.com> Thu Jan 06 08:21:23 2011 -0800
committer Glenn Kasten <gkasten@google.com> Thu Jan 06 08:42:35 2011 -0800
tree 4ce96112d9ffc41b78e144398c8b9478756658f9
parent e9db711d8b5dd1c816c782afd0b30fb245250418

Update native audio API levels and trademarks

Add clarification about future API levels.
Add trademark symbols at first reference.

Change-Id: Iac4437b6c78bfe36f0d2f9857d938afbb98f4894

docs/CHANGES.html

diff --git a/docs/CHANGES.html b/docs/CHANGES.html
index a5d9a4c..62c6099 100644
--- a/docs/CHANGES.html
+++ b/docs/CHANGES.html
@@ -95,7 +95,7 @@
 - Support for API level 9, (a.k.a. Android 2.3) which adds the following
   native features to the platform:
 
-     - Native audio API through the OpenSL ES Standard.
+     - Native audio API based on the Khronos Group OpenSL ES™ 1.0.1 Standard.
        New headers <SLES/OpenSLES.h> and <SLES/OpenSLES_Android.h>
        are provided to allow applications targetting this API level to perform
        audio input, output and processing directly from native code.

docs/STABLE-APIS.html

diff --git a/docs/STABLE-APIS.html b/docs/STABLE-APIS.html
index 80449fb..9ccf9ef 100644
--- a/docs/STABLE-APIS.html
+++ b/docs/STABLE-APIS.html
@@ -284,6 +284,8 @@
 The OpenSL ES native audio Library:
 -----------------------------------
 
+Android native audio is based on Khronos Group OpenSL ES™ 1.0.1.
+
 The standard OpenSL ES headers <SLES/OpenSLES.h> and <SLES/OpenSLES_Platform.h>
 contain the declarations needed to perform audio input and output from the
 native side of Android.
@@ -349,4 +351,4 @@
 version that comes with API level 9. To use it, use the following:
 
     LOCAL_LDLIBS += -landroid
-</pre></body></html>
\ No newline at end of file
+</pre></body></html>

docs/opensles/index.html

diff --git a/docs/opensles/index.html b/docs/opensles/index.html
index 20e357e..3ba3996 100644
--- a/docs/opensles/index.html
+++ b/docs/opensles/index.html
@@ -11,7 +11,7 @@
 <h1>OpenSL ES for Android</h1>
 
 This article describes the Android native audio APIs based on the
-Khronos Group OpenSL ES 1.0.1 standard, as of Android API level 9 (Android
+Khronos Group OpenSL ES&#0153; 1.0.1 standard, as of Android API level 9 (Android
 version 2.3).
 <p>
 OpenSL ES provides a C language interface that is also callable from C++, and
@@ -603,6 +603,8 @@
 <code>Engine::IsExtensionSupported</code> report these extensions:
 <ul>
 <li><code>ANDROID_SDK_LEVEL_9</code>
+(platforms that support a higher API level will report an extension of
+<code>ANDROID_SDK_LEVEL_#</code> where # is that API level)
 </ul>
 
 <h2>Programming notes</h2>