diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2010-04-28 15:50:56 -0700 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2010-04-28 15:50:56 -0700 |
commit | c8652199d14dc42edf882a8eb9e48a5fe0b6101d (patch) | |
tree | fe2371c749e1bdc9bffee4781a332e912e89a390 /media | |
parent | 91a62f3d4a6b4f92c694d09e991fc6f82701fc47 (diff) | |
parent | c6f8ea4cf26aadc0da765585d37f7850596af6de (diff) | |
download | frameworks_base-c8652199d14dc42edf882a8eb9e48a5fe0b6101d.zip frameworks_base-c8652199d14dc42edf882a8eb9e48a5fe0b6101d.tar.gz frameworks_base-c8652199d14dc42edf882a8eb9e48a5fe0b6101d.tar.bz2 |
merge from open-source master
Change-Id: I20fa79289d84a892def9e7f6d6e7026d9de48010
Diffstat (limited to 'media')
-rw-r--r-- | media/java/android/media/MediaPlayer.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java index e8b89e0..8f6564a 100644 --- a/media/java/android/media/MediaPlayer.java +++ b/media/java/android/media/MediaPlayer.java @@ -133,7 +133,7 @@ import java.lang.ref.WeakReference; * <li>It is good programming practice to have your application * register a OnErrorListener to look out for error notifications from * the internal player engine.</li> - * <li>IlleglStateException is + * <li>IllegalStateException is * thrown to prevent programming errors such as calling {@link #prepare()}, * {@link #prepareAsync()}, or one of the overloaded <code>setDataSource * </code> methods in an invalid state. </li> |