summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-05-07Merge "Xcode 4.3 compatibility checkin"android-sdk-adt_r20tools_r20ics-plus-aospJean-Baptiste Queru
2012-05-03Merge "Xcode 4.3 compatibility checkin"Jean-Baptiste Queru
2012-05-03Xcode 4.3 compatibility checkinAl Sutton
Xcode 4.3 is unable to find the inlined methods when linking libSR_Recognizer, so this patch clears the definition of PINLINE for the Xcode 4.3 compiler which ensures that the methods which cause the errors are not inlined Change-Id: I28d0bdf084cb60e93db80fe8a8c7ad6d0dd01dc0 Signed-off-by: Al Sutton <al@funkyandroid.com>
2012-02-19Xcode 4.3 compatibility checkinAl Sutton
The update compiler in Xcode 4.3 (and 4.4) requires lookups into dependant bases of class templates to be qualified. This checkin fixes the issues raised by the compiler by implementing the this-> recommendation from the llvm page at http://clang.llvm.org/compatibility.html#dep_lookup_bases Signed-off-by: Al Sutton <al@funkyandroid.com>
2011-07-11Remove the simulator target from all makefiles.android-sdk-adt_r16.0.1android-sdk-4.0.3_r1android-sdk-4.0.3-tools_r1android-cts-verifier-4.0_r1android-cts-verifier-4.0.3_r1android-cts-4.0_r1android-cts-4.0.3_r2android-cts-4.0.3_r1android-4.0.4_r2.1android-4.0.4_r2android-4.0.4_r1.2android-4.0.4_r1.1android-4.0.4_r1android-4.0.3_r1.1android-4.0.3_r1android-4.0.2_r1android-4.0.1_r1.2android-4.0.1_r1.1android-4.0.1_r1ics-mr1-releaseics-mr1ics-mr0-releaseics-mr0ics-factoryrom-2-releaseJeff Brown
Bug: 5010576 Change-Id: I35dafaa642725a447be8ca5d067bff20c3613b1c
2011-05-11update for new audio.h header locationDima Zavin
Change-Id: Ia8c12a63e39b9baad6e039d81100e5fbe5ff7dec Signed-off-by: Dima Zavin <dima@android.com>
2011-04-25srec: convert to use new audio.hDima Zavin
Change-Id: Ifc945f9fd99e40a051406b0a0889967ceae92ece Signed-off-by: Dima Zavin <dima@android.com>
2011-01-11Merge "Fix crash occuring when using Recognizer"android-sdk-tools_r12android-sdk-adt_r12Nick Kralevich
2011-01-03Fix crash occuring when using RecognizerJohn Eckerdal
The SR_RecognizerResultGetKeyList should return [Ljava/lang/String, however the code as written before the change will actually return [[Ljava/lang/String This "worked" before, probably by accident, but since dvmFindArrayClassForElement has been rewritten to no longer used a cached arrayClass. The dvmFindArrayClassForElement actually prepends the [ and it should not be in SR_RecognizerResultGetKeyList. Change-Id: Ida74600f224d8a7f9906c51b1881dcb9451cc289
2010-10-21Fix bug 3119612 Set VoiceDialer to use the VOICE_RECOGNITION audio source.android-sdk-2.3.4_r1android-cts-2.3_r5android-cts-2.3_r4android-cts-2.3_r3android-cts-2.3_r2android-cts-2.3_r12android-cts-2.3_r11android-cts-2.3_r10android-cts-2.3_r1android-2.3_r1android-2.3.7_r1android-2.3.6_r1android-2.3.6_r0.9android-2.3.5_r1android-2.3.4_r1android-2.3.4_r0.9android-2.3.3_r1aandroid-2.3.3_r1.1android-2.3.3_r1android-2.3.2_r1android-2.3.1_r1gingerbread-releasegingerbread-mr4-releasegingerbreadJean-Michel Trivi
2010-07-16add meta-files about 3rd party projectsThe Android Open Source Project
Change-Id: Icedfb871849cdbd34dd9eb81a0392cbbeb3c569b
2010-05-14Get rid of warnings when compiled with -Wformat-securityNick Kralevich
Change-Id: I01014d78c9e9a17c2010660cbfab28f189867f26
2010-05-14Get rid of warnings when compiled with -Wformat-securityNick Kralevich
Change-Id: I0297f9e3cccdb7adf1aed583539b84c6c06e3f5e
2010-05-05For issue #2651381, allow library prelinking.android-sdk-tools_r7android-sdk-tools_r6android-sdk-2.2_r2android-sdk-2.2_r1android-cts-2.2_r8android-cts-2.2_r7android-cts-2.2_r6android-cts-2.2_r5android-cts-2.2_r4android-cts-2.2_r3android-cts-2.2_r2android-cts-2.2_r1android-adt-0.9.9android-adt-0.9.8android-2.2_r1.3android-2.2_r1.2android-2.2_r1.1android-2.2_r1android-2.2.3_r2.1android-2.2.3_r2android-2.2.3_r1android-2.2.2_r1android-2.2.1_r2android-2.2.1_r1tools_r9tools_r8tools_r7froyo-releasefroyo-plus-aospfroyoDan Bornstein
Change-Id: I38b84e6d61a09d569d17c3dbb47ed271c27342ad
2010-03-25Revert change Ibef3b834Martin Hibdon
Change Ibef3b834 increased the size of buffers to address Bug: 2537307. This was not an ideal solution, because it consumes more memory and is still vulnerable to failure if package names or class names get larger. Change I127c860b fixes the problem in a different way, so we can now shrink the buffer size back to the original value. Change-Id: I67db90017bb84b2c4a4ff962e5a524a9a32b67e8
2010-03-24Make the voiceDialer work againMartin Hibdon
Bug: 2537307 The recognizer has a limit on the size of each semantic value in the grammar. Now that we are storing both the package name and class name there, it's pretty easy to overflow the limit. This change doubles the size of the buffer, making this overflow less likely. Change-Id: Ibef3b834cf867e3e4ad7678289460e451e704f2f
2010-03-19An attempt at fixing the opal build.Andreas Huber
Change-Id: Ia753794affbd79edd55b51238e68831e981256f0 related-to-bug: 2513148
2010-03-18Make libSR_AudioIn a shared library.Andreas Huber
Change-Id: Idf69fa0d8a5f29dd5fe7ab0ec9b75d56ef8f4479 related-to-bug: related-to-bug: 2513148
2010-03-18Revert "Make libSR_AudioIn a shared library."Andreas Huber
This reverts commit ecc8abf047fb7351d8266a925076ac13672a4395.
2010-03-18Make libSR_AudioIn a shared library.Andreas Huber
Change-Id: Idf6c132304fd30a4418eb6bf913c9047b4f38ee5 related-to-bug: 2513148
2010-03-08Add an empty CleanSpec.mkJean-Baptiste Queru
Change-Id: I6af3d47fd023d99a2f2fdbd6c94de93e7cf143ab
2010-03-04Update th phone_type_choice and voice_dialer grammarsmah
Both of these grammars now support the commands "exit" and "cancel", which will result in the voice dialer exiting.
2010-02-25Add phone_type_choice grammar to Srecmah
Bug#232200 This grammar accepts the four phone types supported by the VoiceDialer: "home", "mobile", "work", and "other", along with "retry" and "exit". It is used when the voicedialer has determined which person to call, but is not yet sure which phone to call them on. Also get rid of some of the uneeded code from the boolean grammar. It was allowing for changes to be made at runtime, but that is not needed.
2010-02-19Merge "Add the boolean grammar to the makefile. This is needed to support ↵Martin Hibdon
the new flow for the bluetooth voice dialer."
2010-02-08Add the boolean grammar to the makefile. This is needed to support themah
new flow for the bluetooth voice dialer.
2010-02-05am f91bed8b: am ee67ee74: reconcile main tree with open-source eclairThe Android Open Source Project
Merge commit 'f91bed8b6616d14bbc94fd63abcf6709d541ee39' * commit 'f91bed8b6616d14bbc94fd63abcf6709d541ee39': android-2.1_r1 snapshot
2010-02-05am ee67ee74: reconcile main tree with open-source eclairThe Android Open Source Project
Merge commit 'ee67ee7420a4a3f95229f8e53780e81589540993' into eclair-plus-aosp * commit 'ee67ee7420a4a3f95229f8e53780e81589540993': android-2.1_r1 snapshot
2010-02-05reconcile main tree with open-source eclairandroid-sdk-tools_r5android-cts-2.1_r5android-cts-2.1_r4android-cts-2.1_r3android-cts-2.1_r2eclairThe Android Open Source Project
2010-01-29reconcile android-2.1_r1 snapshotThe Android Open Source Project
2010-01-12android-2.1_r1 snapshotThe Android Open Source Project
2009-11-15am b888ee10: merge from open-source masterJean-Baptiste Queru
Merge commit 'b888ee1007939e6bcc6e9693edea404219b17e18' * commit 'b888ee1007939e6bcc6e9693edea404219b17e18': eclair snapshot Fix bug 2243155 Set VoiceDialer to use the VOICE_RECOGNITION audio source.
2009-11-15merge from open-source masterJean-Baptiste Queru
2009-11-15merge from open-source masterJean-Baptiste Queru
Merge commit 'goog/stage-korg-master' into HEAD
2009-11-15merge from eclairJean-Baptiste Queru
2009-11-12eclair snapshotJean-Baptiste Queru
2009-11-05am 3133210f: Fix bug 2243155 Set VoiceDialer to use the VOICE_RECOGNITION ↵Jean-Michel Trivi
audio source. Merge commit '3133210f7381d7510af72a72a7472ab4fdaef698' into eclair-plus-aosp * commit '3133210f7381d7510af72a72a7472ab4fdaef698': Fix bug 2243155 Set VoiceDialer to use the VOICE_RECOGNITION audio source.
2009-11-05Fix bug 2243155 Set VoiceDialer to use the VOICE_RECOGNITION audio source.android-sdk-2.1_r1android-sdk-2.0.1_r1android-sdk-2.0.1-docs_r1android-2.1_r2.1sandroid-2.1_r2.1p2android-2.1_r2.1pandroid-2.1_r2android-2.1_r1android-2.0.1_r1eclair-sholes-release2eclair-sholes-releaseeclair-releaseeclair-passion-releaseJean-Michel Trivi
2009-10-02Add back missing shared library used by executable in linker command.Doug Kwan
Currently this library is linked via dependency of another shared library. While this works, it is not the right thigh to do.
2009-09-23am 7d56aaf9: Fix crash in voice recognizer when it fails to load the ↵Marco Nelissen
acoustic model Merge commit '7d56aaf97085593d3aa8080451783fc080731539' into eclair-plus-aosp * commit '7d56aaf97085593d3aa8080451783fc080731539': Fix crash in voice recognizer when it fails to load the acoustic model
2009-09-22Fix crash in voice recognizer when it fails to load the acoustic modelandroid-sdk-tools_r4android-sdk-tools_r3android-sdk-2.0_r1android-2.0_r1Marco Nelissen
2009-09-16merge from open-source masterJean-Baptiste Queru
2009-09-15Merge change 10545donut-plus-aospAndroid Code Review
* changes: modified to support SuperH architecture
2009-09-01merge from open-source masterJean-Baptiste Queru
2009-08-05Removed libdl from libraries to link with when building on FreeBSDAlexey Tarasov
2009-07-26reconcile korg/master into goog/masterJean-Baptiste Queru
2009-07-25Merge korg/donut into korg/masterJean-Baptiste Queru
2009-07-22Fix issue 1795088 Improve audio routing codeEric Laurent
Integrated comments after patch set 1 review.
2009-07-01modified to support SuperH architectureShin-ichiro KAWASAKI
2009-06-24am 1bfedbd0: Include cstdio so that this header file can compile with gcc 4.4.Jack Palevich
Merge commit '1bfedbd04122c0e177caf693423aabad3462d66d' * commit '1bfedbd04122c0e177caf693423aabad3462d66d': Include cstdio so that this header file can compile with gcc 4.4.
2009-06-24Include cstdio so that this header file can compile with gcc 4.4.android-sdk-tools_r2android-sdk-1.6_r2android-sdk-1.6_r1android-sdk-1.6-docs_r1android-1.6_r2android-1.6_r1.5android-1.6_r1.4android-1.6_r1.3android-1.6_r1.2android-1.6_r1.1android-1.6_r1donut-release2donut-releasedonutJack Palevich
Otherwise printf is undeclared. This code worked with earlier versions of gcc because either cstdio or stdio.h was being included by some other header file. But this was not guaranteed behavior, so with GCC 4.4 there is an error. The fix is backwards compatible with earlier versions of GCC. Note, I'm using "GCC" to mean Gnu Compile Collection, as this problem is specific to the C++ compiler, not the C compiler.