diff options
| author | Przemyslaw Szczepaniak <pszczepaniak@google.com> | 2014-09-26 09:31:04 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-26 09:31:04 +0000 |
| commit | 16f5ec12078f48471e746259fa4d456a315203eb (patch) | |
| tree | d023d82469709969fc94e68ab95aea11149b98f5 /api/current.txt | |
| parent | f46a7b1ddd4f66d65c2722cadd7a489a9e8d5b8c (diff) | |
| parent | d95788bf85b7a21ed798f62557d7ca957ddca159 (diff) | |
| download | frameworks_base-16f5ec12078f48471e746259fa4d456a315203eb.zip frameworks_base-16f5ec12078f48471e746259fa4d456a315203eb.tar.gz frameworks_base-16f5ec12078f48471e746259fa4d456a315203eb.tar.bz2 | |
am 8924617d: am f0a7c767: Merge "Fix ambiguous TTS#playSilence method." into lmp-dev
* commit '8924617dd13785fa6285d5f9eb6fd20423077a73':
Fix ambiguous TTS#playSilence method.
Diffstat (limited to 'api/current.txt')
| -rw-r--r-- | api/current.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index 4f170e4..5664e63 100644 --- a/api/current.txt +++ b/api/current.txt @@ -27281,8 +27281,8 @@ package android.speech.tts { method public boolean isSpeaking(); method public int playEarcon(java.lang.String, int, android.os.Bundle, java.lang.String); method public deprecated int playEarcon(java.lang.String, int, java.util.HashMap<java.lang.String, java.lang.String>); - method public int playSilence(long, int, java.lang.String); method public deprecated int playSilence(long, int, java.util.HashMap<java.lang.String, java.lang.String>); + method public int playSilentUtterance(long, int, java.lang.String); method public int setAudioAttributes(android.media.AudioAttributes); method public deprecated int setEngineByPackageName(java.lang.String); method public int setLanguage(java.util.Locale); |