diff options
author | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-06 18:34:40 -0400 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-06 18:34:40 -0400 |
commit | 521f4f3af94e3a093a37af887d3e317a526b61a1 (patch) | |
tree | 375e51a9182304f53d300f3f6fe75a067fa8d3b6 | |
parent | 5f9d4bae03b2dfa9c1e43a6e01cacaa5a5326690 (diff) | |
parent | 3b49e9b52558b5c45240d098410bd5afbd29e1fe (diff) | |
download | frameworks_base-521f4f3af94e3a093a37af887d3e317a526b61a1.zip frameworks_base-521f4f3af94e3a093a37af887d3e317a526b61a1.tar.gz frameworks_base-521f4f3af94e3a093a37af887d3e317a526b61a1.tar.bz2 |
Merge change I3d6cf8aa into eclair
* changes:
Fix for bug 2158794. Hide MediaPlayer.invoke() and MediaPlayer.newRequest(), and Fix bad links in ToneGenerator documentation.
-rw-r--r-- | api/current.xml | 26 | ||||
-rw-r--r-- | media/java/android/media/MediaPlayer.java | 2 | ||||
-rw-r--r-- | media/java/android/media/ToneGenerator.java | 4 |
3 files changed, 4 insertions, 28 deletions
diff --git a/api/current.xml b/api/current.xml index 7ebf058..3e3434a 100644 --- a/api/current.xml +++ b/api/current.xml @@ -77986,21 +77986,6 @@ visibility="public" > </method> -<method name="invoke" - return="int" - abstract="false" - native="false" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="request" type="android.os.Parcel"> -</parameter> -<parameter name="reply" type="android.os.Parcel"> -</parameter> -</method> <method name="isLooping" return="boolean" abstract="false" @@ -78023,17 +78008,6 @@ visibility="public" > </method> -<method name="newRequest" - return="android.os.Parcel" - abstract="false" - native="false" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -</method> <method name="pause" return="void" abstract="false" diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java index 472542d..a676782 100644 --- a/media/java/android/media/MediaPlayer.java +++ b/media/java/android/media/MediaPlayer.java @@ -522,6 +522,7 @@ public class MediaPlayer * * @return A parcel suitable to hold a request for the native * player. + * {@hide} */ public Parcel newRequest() { Parcel parcel = Parcel.obtain(); @@ -543,6 +544,7 @@ public class MediaPlayer * native player. * * @return The status code see utils/Errors.h + * {@hide} */ public int invoke(Parcel request, Parcel reply) { int retcode = native_invoke(request, reply); diff --git a/media/java/android/media/ToneGenerator.java b/media/java/android/media/ToneGenerator.java index d4ae80f..d232265 100644 --- a/media/java/android/media/ToneGenerator.java +++ b/media/java/android/media/ToneGenerator.java @@ -852,10 +852,10 @@ public class ToneGenerator /** * This method starts the playback of a tone of the specified type for the specified duration. - * @param toneType The type of tone generated @see #startTone(int). + * @param toneType The type of tone generated @see {@link #startTone(int)}. * @param durationMs The tone duration in milliseconds. If the tone is limited in time by definition, * the actual duration will be the minimum of durationMs and the defined tone duration. Setting durationMs to -1, - * is equivalent to calling #startTone(int). + * is equivalent to calling {@link #startTone(int)}. */ public native boolean startTone(int toneType, int durationMs); |