OSDN Git Service
summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
Al Sutton [Tue, 21 Feb 2012 12:32:30 +0000 (12:32 +0000)]
Xcode 4.3 compatibility checkin
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>
Al Sutton [Sun, 19 Feb 2012 08:44:46 +0000 (08:44 +0000)]
Xcode 4.3 compatibility checkin
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>
Jeff Brown [Tue, 12 Jul 2011 05:12:05 +0000 (22:12 -0700)]
Remove the simulator target from all makefiles.
Bug:
5010576
Change-Id: I35dafaa642725a447be8ca5d067bff20c3613b1c
Dima Zavin [Wed, 11 May 2011 21:14:06 +0000 (14:14 -0700)]
update for new audio.h header location
Change-Id: Ia8c12a63e39b9baad6e039d81100e5fbe5ff7dec
Signed-off-by: Dima Zavin <dima@android.com>
Dima Zavin [Tue, 5 Apr 2011 23:03:30 +0000 (16:03 -0700)]
srec: convert to use new audio.h
Change-Id: Ifc945f9fd99e40a051406b0a0889967ceae92ece
Signed-off-by: Dima Zavin <dima@android.com>
Nick Kralevich [Tue, 11 Jan 2011 20:49:57 +0000 (12:49 -0800)]
Merge "Fix crash occuring when using Recognizer"
John Eckerdal [Mon, 3 Jan 2011 12:19:27 +0000 (13:19 +0100)]
Fix crash occuring when using Recognizer
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
Jean-Michel Trivi [Fri, 6 Nov 2009 03:33:05 +0000 (19:33 -0800)]
Fix bug
3119612 Set VoiceDialer to use the VOICE_RECOGNITION audio source.
The Android Open Source Project [Fri, 16 Jul 2010 18:41:36 +0000 (11:41 -0700)]
add meta-files about 3rd party projects
Change-Id: Icedfb871849cdbd34dd9eb81a0392cbbeb3c569b
Nick Kralevich [Fri, 14 May 2010 20:09:26 +0000 (13:09 -0700)]
Get rid of warnings when compiled with -Wformat-security
Change-Id: I01014d78c9e9a17c2010660cbfab28f189867f26
Nick Kralevich [Fri, 14 May 2010 17:50:03 +0000 (10:50 -0700)]
Get rid of warnings when compiled with -Wformat-security
Change-Id: I0297f9e3cccdb7adf1aed583539b84c6c06e3f5e
Dan Bornstein [Thu, 6 May 2010 01:22:11 +0000 (18:22 -0700)]
For issue #
2651381, allow library prelinking.
Change-Id: I38b84e6d61a09d569d17c3dbb47ed271c27342ad
Martin Hibdon [Thu, 25 Mar 2010 21:54:06 +0000 (14:54 -0700)]
Revert change Ibef3b834
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
Martin Hibdon [Wed, 24 Mar 2010 23:52:07 +0000 (16:52 -0700)]
Make the voiceDialer work again
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
Andreas Huber [Fri, 19 Mar 2010 15:27:19 +0000 (08:27 -0700)]
An attempt at fixing the opal build.
Change-Id: Ia753794affbd79edd55b51238e68831e981256f0
related-to-bug:
2513148
Andreas Huber [Thu, 18 Mar 2010 22:20:35 +0000 (15:20 -0700)]
Make libSR_AudioIn a shared library.
Change-Id: Idf69fa0d8a5f29dd5fe7ab0ec9b75d56ef8f4479
related-to-bug: related-to-bug:
2513148
Andreas Huber [Thu, 18 Mar 2010 21:30:46 +0000 (14:30 -0700)]
Revert "Make libSR_AudioIn a shared library."
This reverts commit
ecc8abf047fb7351d8266a925076ac13672a4395.
Andreas Huber [Thu, 18 Mar 2010 18:23:02 +0000 (11:23 -0700)]
Make libSR_AudioIn a shared library.
Change-Id: Idf6c132304fd30a4418eb6bf913c9047b4f38ee5
related-to-bug:
2513148
Jean-Baptiste Queru [Tue, 9 Mar 2010 02:04:43 +0000 (18:04 -0800)]
Add an empty CleanSpec.mk
Change-Id: I6af3d47fd023d99a2f2fdbd6c94de93e7cf143ab
mah [Fri, 5 Mar 2010 00:18:11 +0000 (16:18 -0800)]
Update th phone_type_choice and voice_dialer grammars
Both of these grammars now support the commands
"exit" and "cancel", which will result in the
voice dialer exiting.
mah [Tue, 23 Feb 2010 23:41:45 +0000 (15:41 -0800)]
Add phone_type_choice grammar to Srec
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.
Martin Hibdon [Fri, 19 Feb 2010 18:57:12 +0000 (10:57 -0800)]
Merge "Add the boolean grammar to the makefile. This is needed to support the new flow for the bluetooth voice dialer."
mah [Tue, 9 Feb 2010 01:47:34 +0000 (17:47 -0800)]
Add the boolean grammar to the makefile. This is needed to support the
new flow for the bluetooth voice dialer.
The Android Open Source Project [Fri, 5 Feb 2010 22:08:57 +0000 (14:08 -0800)]
am
f91bed8b: am
ee67ee74: reconcile main tree with open-source eclair
Merge commit '
f91bed8b6616d14bbc94fd63abcf6709d541ee39'
* commit '
f91bed8b6616d14bbc94fd63abcf6709d541ee39':
android-2.1_r1 snapshot
The Android Open Source Project [Fri, 5 Feb 2010 16:23:27 +0000 (08:23 -0800)]
am
ee67ee74: reconcile main tree with open-source eclair
Merge commit '
ee67ee7420a4a3f95229f8e53780e81589540993' into eclair-plus-aosp
* commit '
ee67ee7420a4a3f95229f8e53780e81589540993':
android-2.1_r1 snapshot
The Android Open Source Project [Fri, 5 Feb 2010 16:09:36 +0000 (08:09 -0800)]
reconcile main tree with open-source eclair
The Android Open Source Project [Fri, 29 Jan 2010 22:08:27 +0000 (14:08 -0800)]
reconcile android-2.1_r1 snapshot
The Android Open Source Project [Tue, 12 Jan 2010 23:18:35 +0000 (15:18 -0800)]
android-2.1_r1 snapshot
Jean-Baptiste Queru [Sun, 15 Nov 2009 23:01:20 +0000 (15:01 -0800)]
am
b888ee10: merge from open-source master
Merge commit '
b888ee1007939e6bcc6e9693edea404219b17e18'
* commit '
b888ee1007939e6bcc6e9693edea404219b17e18':
eclair snapshot
Fix bug
2243155 Set VoiceDialer to use the VOICE_RECOGNITION audio source.
Jean-Baptiste Queru [Sun, 15 Nov 2009 22:55:17 +0000 (14:55 -0800)]
merge from open-source master
Jean-Baptiste Queru [Sun, 15 Nov 2009 22:06:20 +0000 (14:06 -0800)]
merge from open-source master
Merge commit 'goog/stage-korg-master' into HEAD
Jean-Baptiste Queru [Sun, 15 Nov 2009 20:06:08 +0000 (12:06 -0800)]
merge from eclair
Jean-Baptiste Queru [Fri, 13 Nov 2009 02:45:38 +0000 (18:45 -0800)]
eclair snapshot
Jean-Michel Trivi [Fri, 6 Nov 2009 04:36:59 +0000 (20:36 -0800)]
am
3133210f: Fix bug
2243155 Set VoiceDialer to use the VOICE_RECOGNITION audio source.
Merge commit '
3133210f7381d7510af72a72a7472ab4fdaef698' into eclair-plus-aosp
* commit '
3133210f7381d7510af72a72a7472ab4fdaef698':
Fix bug
2243155 Set VoiceDialer to use the VOICE_RECOGNITION audio source.
Jean-Michel Trivi [Fri, 6 Nov 2009 03:33:05 +0000 (19:33 -0800)]
Fix bug
2243155 Set VoiceDialer to use the VOICE_RECOGNITION audio source.
Doug Kwan [Fri, 2 Oct 2009 18:28:33 +0000 (11:28 -0700)]
Add back missing shared library used by executable in linker command.
Currently this library is linked via dependency of another shared library.
While this works, it is not the right thigh to do.
Marco Nelissen [Wed, 23 Sep 2009 15:04:56 +0000 (08:04 -0700)]
am
7d56aaf9: Fix crash in voice recognizer when it fails to load the acoustic model
Merge commit '
7d56aaf97085593d3aa8080451783fc080731539' into eclair-plus-aosp
* commit '
7d56aaf97085593d3aa8080451783fc080731539':
Fix crash in voice recognizer when it fails to load the acoustic model
Marco Nelissen [Tue, 22 Sep 2009 23:48:43 +0000 (16:48 -0700)]
Fix crash in voice recognizer when it fails to load the acoustic model
Jean-Baptiste Queru [Wed, 16 Sep 2009 23:22:06 +0000 (16:22 -0700)]
merge from open-source master
Android Code Review [Tue, 15 Sep 2009 22:34:01 +0000 (15:34 -0700)]
Merge change 10545
* changes:
modified to support SuperH architecture
Jean-Baptiste Queru [Tue, 1 Sep 2009 15:28:11 +0000 (08:28 -0700)]
merge from open-source master
Alexey Tarasov [Sat, 8 Nov 2008 23:58:37 +0000 (09:58 +1000)]
Removed libdl from libraries to link with when building on FreeBSD
Jean-Baptiste Queru [Sun, 26 Jul 2009 18:43:55 +0000 (11:43 -0700)]
reconcile korg/master into goog/master
Jean-Baptiste Queru [Sun, 26 Jul 2009 00:48:02 +0000 (17:48 -0700)]
Merge korg/donut into korg/master
Eric Laurent [Fri, 17 Jul 2009 18:25:44 +0000 (11:25 -0700)]
Fix issue
1795088 Improve audio routing code
Integrated comments after patch set 1 review.
Shin-ichiro KAWASAKI [Wed, 1 Jul 2009 07:07:25 +0000 (16:07 +0900)]
modified to support SuperH architecture
Jack Palevich [Thu, 25 Jun 2009 01:43:22 +0000 (18:43 -0700)]
am
1bfedbd0: Include cstdio so that this header file can compile with gcc 4.4.
Merge commit '
1bfedbd04122c0e177caf693423aabad3462d66d'
* commit '
1bfedbd04122c0e177caf693423aabad3462d66d':
Include cstdio so that this header file can compile with gcc 4.4.
Jack Palevich [Thu, 25 Jun 2009 00:43:54 +0000 (17:43 -0700)]
Include cstdio so that this header file can compile with gcc 4.4.
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.
Sriram Raman [Tue, 23 Jun 2009 05:04:51 +0000 (22:04 -0700)]
am
ed4cbb76: Remove SREC tests from tests build
Merge commit '
ed4cbb766a2d83f71c03b1b327d696e7b56377a6'
* commit '
ed4cbb766a2d83f71c03b1b327d696e7b56377a6':
Remove SREC tests from tests build
Sriram Raman [Tue, 23 Jun 2009 00:21:33 +0000 (17:21 -0700)]
Remove SREC tests from tests build
Sriram Raman [Fri, 29 May 2009 21:06:58 +0000 (14:06 -0700)]
Don't build SRecTest and SRecTestAudio with tests build (system.img gets too large)
Jean-Baptiste Queru [Thu, 23 Apr 2009 00:12:25 +0000 (17:12 -0700)]
Merge donut into master
Scott Tsai [Fri, 20 Mar 2009 23:28:10 +0000 (07:28 +0800)]
grxmlcompile: include <cstdio> in files that wants netw_arc.h
to make the code build on gcc-4.4.
NUANArc::Print{,Text} in netw_arc.h uses 'printf' which is no longer
implicitly pulled in by <iostream> in gcc >= 4.4.
Sean McNeil [Sun, 2 Nov 2008 01:32:11 +0000 (08:32 +0700)]
Android on Freerunner support
The Android Open Source Project [Sun, 29 Mar 2009 15:55:30 +0000 (08:55 -0700)]
Merge branch 'open_source_contributions_cherry_picked' into google_internal
Scott Tsai [Fri, 20 Mar 2009 23:28:10 +0000 (07:28 +0800)]
grxmlcompile: include <cstdio> in files that wants netw_arc.h
to make the code build on gcc-4.4.
NUANArc::Print{,Text} in netw_arc.h uses 'printf' which is no longer
implicitly pulled in by <iostream> in gcc >= 4.4.
Jean-Baptiste Queru [Tue, 17 Mar 2009 23:08:02 +0000 (16:08 -0700)]
Merge commit 'remotes/korg/cupcake' into merge
Sean McNeil [Sun, 2 Nov 2008 01:32:11 +0000 (08:32 +0700)]
Android on Freerunner support
The Android Open Source Project [Wed, 4 Mar 2009 03:30:40 +0000 (19:30 -0800)]
auto import from //depot/cupcake/@135843
The Android Open Source Project [Wed, 4 Mar 2009 02:28:37 +0000 (18:28 -0800)]
auto import from //depot/cupcake/@135843
The Android Open Source Project [Tue, 3 Mar 2009 22:04:17 +0000 (14:04 -0800)]
auto import from //depot/cupcake/@132589
The Android Open Source Project [Tue, 3 Mar 2009 06:54:31 +0000 (22:54 -0800)]
auto import from //depot/cupcake/@137055
The Android Open Source Project [Thu, 19 Feb 2009 18:57:31 +0000 (10:57 -0800)]
auto import from //branches/cupcake/...@132276
The Android Open Source Project [Tue, 10 Feb 2009 23:44:00 +0000 (15:44 -0800)]
auto import from //branches/cupcake/...@130745
The Android Open Source Project [Thu, 22 Jan 2009 08:16:03 +0000 (00:16 -0800)]
Merge branch 'cupcake'
The Android Open Source Project [Thu, 22 Jan 2009 08:13:42 +0000 (00:13 -0800)]
auto import from //branches/cupcake/...@127436
The Android Open Source Project [Tue, 20 Jan 2009 22:05:31 +0000 (14:05 -0800)]
Merge branch 'cupcake'
The Android Open Source Project [Tue, 20 Jan 2009 22:03:57 +0000 (14:03 -0800)]
auto import from //branches/cupcake/...@127101
android-build SharedAccount [Fri, 16 Jan 2009 00:15:55 +0000 (16:15 -0800)]
Merge branch 'cupcake'
The Android Open Source Project [Fri, 16 Jan 2009 00:12:09 +0000 (16:12 -0800)]
auto import from //branches/cupcake/...@126645
The Android Open Source Project [Sat, 10 Jan 2009 02:04:18 +0000 (18:04 -0800)]
Merge branch 'cupcake'
The Android Open Source Project [Sat, 10 Jan 2009 01:51:23 +0000 (17:51 -0800)]
auto import from //branches/cupcake/...@125939
Jean-Baptiste Queru [Fri, 19 Dec 2008 15:54:59 +0000 (07:54 -0800)]
Merge commit 'remotes/korg/cupcake'
The Android Open Source Project [Thu, 18 Dec 2008 02:04:57 +0000 (18:04 -0800)]
Code drop from //branches/cupcake/...@124589
Alexey Tarasov [Fri, 7 Nov 2008 01:33:39 +0000 (11:33 +1000)]
Updated makefiles for correct building on FreeBSD
Alexey Zaytsev [Tue, 21 Oct 2008 22:04:55 +0000 (02:04 +0400)]
Add a few missing headers.
Fixes build with gcc 4.3.2 on Debian.
Signed-off-by: Alexey Zaytsev <alexey.zaytsev@gmail.com>
The Android Open Source Project [Tue, 21 Oct 2008 14:00:00 +0000 (07:00 -0700)]
Initial Contribution