drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,868 Commits 1 Branch 0 Tags
Commit Graph

1839 Commits

Author SHA1 Message Date
Daniel Sandler
a32efedd26 am de3601e0: am bcac4960: Honor the "Never vibrate" setting for incoming calls. 
Merge commit 'de3601e05cf551e24eee50d4c1e70b5037792679' into kraken

* commit 'de3601e05cf551e24eee50d4c1e70b5037792679':
  Honor the "Never vibrate" setting for incoming calls.
 2010-04-13 11:53:30 -07:00
James Dong
722d591842 Don't set encoder component role while we query decoders 
bug - 2558515

Change-Id: I29683507d234d963994c782c07508034ea807739
 2010-04-13 10:58:41 -07:00
Mathias Agopian
f221b6324d am e73a100f: am 445a9785: Merge "don\'t hardcode "mSurface" throughout our source code" into kraken 2010-04-13 10:37:55 -07:00
Mathias Agopian
e73a100feb am 445a9785: Merge "don\'t hardcode "mSurface" throughout our source code" into kraken 2010-04-13 10:33:07 -07:00
Jean-Michel Trivi
c30890e102 Merge "Fix bug 2578813 Delay pausing music and routing audio for car docks" into froyo 2010-04-13 09:53:35 -07:00
Gloria Wang
b19da8e187 Fix for 2581725. Keep the last frame after resume(), and delete it 
in the next suspend() or reuse it if no new frame is available.

Change-Id: I84286030eaae9061077d6ccb485b7dd53ef05341
 2010-04-13 09:46:40 -07:00
Jean-Michel Trivi
4c637b9e34 Fix bug 2578813 Delay pausing music and routing audio for car docks 
Moved broadcast of ACTION_AUDIO_BECOMING_NOISY from BluetoothA2dpService
to AudioService.
Broadcast ACTION_AUDIO_BECOMING_NOISY when disconnecting an A2DP
device.
Disconnect from A2DP docks with a delay to handle transient
disconnections.
Cancel delayed A2DP disconnections when connecting to a dock as this
can be a reconnection after a transient disconnection.

Change-Id: I1ee9e99f3ffa20727af38a4c4c8711942894a696
 2010-04-13 09:44:08 -07:00
Daniel Sandler
bcac496076 Honor the "Never vibrate" setting for incoming calls. 
Bug: 2579295
Change-Id: Ia4207492c5dfa2c39d27372c4892b60121b6d9e8
 2010-04-13 12:18:44 -04:00
Mathias Agopian
445a978554 Merge "don't hardcode "mSurface" throughout our source code" into kraken 2010-04-12 18:59:49 -07:00
Andreas Huber
275e0662c1 am 63642b12: am 7853c898: am 248ea4a9: am 5baa5e19: Merge "Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we don\'t have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks." into froyo 2010-04-12 17:28:48 -07:00
Andreas Huber
63642b1202 am 7853c898: am 248ea4a9: am 5baa5e19: Merge "Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we don\'t have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks." into froyo 2010-04-12 17:25:48 -07:00
Andreas Huber
7853c8988f am 248ea4a9: am 5baa5e19: Merge "Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we don\'t have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks." into froyo 
Merge commit '248ea4a9f773210a7b7dbd7892e6b865a0f7add3' into kraken

* commit '248ea4a9f773210a7b7dbd7892e6b865a0f7add3':
  Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we don't have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks.
 2010-04-12 17:21:33 -07:00
Mathias Agopian
8b138323d5 don't hardcode "mSurface" throughout our source code 
this is used in a few places to get access to the android.view.Surface
native surface. use a macro instead. Also rename the field to mNativeSurface.

Change-Id: I1c6dea14abd6b8b1392c7f97b304115999355094
 2010-04-12 16:29:36 -07:00
Andreas Huber
d0332ad8d2 Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we don't have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks. 
Change-Id: Ic9a9198413431db4ea40bb63b9de91aa8a7183af
related-to-bug: 2587341
 2010-04-12 16:05:57 -07:00
Jean-Baptiste Queru
36ce643dbe am cd839752: manual merge 2010-04-12 15:38:08 -07:00
Jean-Baptiste Queru
cd8397524a manual merge 
Change-Id: I9cdacbf1e445e7f6cf06ad03df541a744c242774
 2010-04-12 15:32:13 -07:00
Andreas Huber
fac0c29e5a am 98c5bd55: am 6dbf80d0: Merge "Fix a race condition in TimedEventQueue, an event may be cancelled while we\'re waiting for its scheduled time to come in which case we\'d be removing it from the queue twice." into froyo 
Merge commit '98c5bd5556f32a237d3483fb7298284869e32a40' into kraken

* commit '98c5bd5556f32a237d3483fb7298284869e32a40':
  Fix a race condition in TimedEventQueue, an event may be cancelled while we're waiting for its scheduled time to come in which case we'd be removing it from the queue twice.
 2010-04-12 14:23:31 -07:00
Andreas Huber
6dbf80d086 Merge "Fix a race condition in TimedEventQueue, an event may be cancelled while we're waiting for its scheduled time to come in which case we'd be removing it from the queue twice." into froyo 2010-04-12 14:16:34 -07:00
Andreas Huber
ea1d6712fe Fix a race condition in TimedEventQueue, an event may be cancelled while we're waiting for its scheduled time to come in which case we'd be removing it from the queue twice. 
Change-Id: I4e42e318fd5373d1f352f54027d4bf823126266d
related-to-bug: 2585276
 2010-04-12 13:15:48 -07:00
Jean-Michel Trivi
9448d6f4dd am 54419a4f: am 12221b6f: Merge "Fix monkey bug 2586534 java.util.ConcurrentModificationException Unlike the other audio focus and media button stack handling methods, abandonAudioFocus() and unregisterAudioFocusClient() were not synchronized around their focus stack. 
Merge commit '54419a4fc908eab8408f39f3eae97c4315135d84' into kraken

* commit '54419a4fc908eab8408f39f3eae97c4315135d84':
  Fix monkey bug 2586534 java.util.ConcurrentModificationException
 2010-04-12 12:11:54 -07:00
Jean-Michel Trivi
12221b6f7c Merge "Fix monkey bug 2586534 java.util.ConcurrentModificationException Unlike the other audio focus and media button stack handling methods, abandonAudioFocus() and unregisterAudioFocusClient() were not synchronized around their focus stack. This CL corrects this." into froyo 2010-04-12 12:05:08 -07:00
Andreas Huber
26a46c4ff6 am f0a49f68: am 1d7a8b44: Merge "Fix a case where the aac hardware decoder is in a transition state and refused a fillbuffer request." into froyo 
Merge commit 'f0a49f68f0edc98fefbe14e3ddcf0d6853519293' into kraken

* commit 'f0a49f68f0edc98fefbe14e3ddcf0d6853519293':
  Fix a case where the aac hardware decoder is in a transition state and refused a fillbuffer request.
 2010-04-12 11:07:54 -07:00
Andreas Huber
967a263d70 Merge "I accidentally broken passion encoding while working around problems with the sholes encoder." into kraken 2010-04-12 11:05:22 -07:00
Andreas Huber
4501f62d7a Merge "Remove unnecessary lock from AMRWriter." into kraken 2010-04-12 11:05:09 -07:00
Andreas Huber
a7f57ef707 Merge "Various fixes to enable recording on passion and nexus1." into kraken 2010-04-12 11:04:57 -07:00
Andreas Huber
4b2bc736b1 Merge "Remove legacy NO_OPENCORE code bypass from MediaPlayerService." into kraken 2010-04-12 11:04:46 -07:00
Andreas Huber
1d7a8b448e Merge "Fix a case where the aac hardware decoder is in a transition state and refused a fillbuffer request." into froyo 2010-04-12 11:02:27 -07:00
Andreas Huber
8f14c55248 Fix a case where the aac hardware decoder is in a transition state and refused a fillbuffer request. 
Change-Id: I4cabd18709c29db0a2763a01cc86525ba0b0aeb7
related-to-bug: 2575976
 2010-04-12 10:20:12 -07:00
Andreas Huber
cdded187d2 Merge "Ignore corrupt aac audio frames and substitute silence." into froyo 2010-04-12 10:11:32 -07:00
Andreas Huber
3f26cade62 Ignore corrupt aac audio frames and substitute silence. 
Change-Id: I544f98a5c00d912061db7921fc4518435209b168
related-to-bug: 2575976
 2010-04-12 09:57:05 -07:00
Andreas Huber
040301cad1 Start sending out buffering updates earlier (after preparation has completed) instead of only after playback has started. 
Change-Id: Ieaa90cc9b54bd56963aa5f4daced2ba243801acf
related-to-bug: 2585913
 2010-04-12 09:41:12 -07:00
Yu Shan Emily Lau
f026c38163 am 5b1b4993: am 45c566e9: am 6e40664f: am 15b02f04: Merge "Remove the checkStremingServer checking as it is unstable and introduce the flakiness." into froyo 2010-04-10 11:59:21 -07:00
Jean-Michel Trivi
2930bb2d47 Fix monkey bug 2586534 java.util.ConcurrentModificationException 
Unlike the other audio focus and media button stack handling
methods, abandonAudioFocus() and unregisterAudioFocusClient() were
not synchronized around their focus stack. This CL corrects this.

Change-Id: I5ada574e4e163fa95da9dad2fefe610b48303320
 2010-04-09 19:27:58 -07:00
Yu Shan Emily Lau
15b02f04c7 Merge "Remove the checkStremingServer checking as it is unstable and introduce the flakiness." into froyo 2010-04-09 16:41:37 -07:00
Andreas Huber
f4e5baa1e9 I accidentally broken passion encoding while working around problems with the sholes encoder. 
Change-Id: Id91b837ed17083cb21efb08e1c1ab9cc3ff3fa8f
 2010-04-09 14:25:46 -07:00
Yu Shan Emily Lau
42349d03bf Remove the checkStremingServer checking as it is unstable and introduce the flakiness. 
Change-Id: I26e48366998e3692ad8a3394a0a0241832e99a6d
 2010-04-09 13:53:56 -07:00
Andreas Huber
e2018ca9ff Remove unnecessary lock from AMRWriter. 
Change-Id: Ia02966d936dd8cbb31e92051578a3fa816885710
 2010-04-09 13:49:39 -07:00
Andreas Huber
71c27d991a Various fixes to enable recording on passion and nexus1. 
Change-Id: I75a461c9882e2449082ad754ee7b231c1ceec039
 2010-04-09 13:47:58 -07:00
Andreas Huber
ab88ea9503 Remove legacy NO_OPENCORE code bypass from MediaPlayerService. 
Change-Id: I72db73c91673e0d7f1090e3b033ae915337dc16e
 2010-04-09 13:44:28 -07:00
Andreas Huber
2228135452 am 0e9a439b: am b39c3aa7: am 91ce0826: am 4be2461f: Merge "Support for ID3 V2.4 tags." into froyo 2010-04-09 08:53:26 -07:00
Andreas Huber
4be2461f06 Merge "Support for ID3 V2.4 tags." into froyo 2010-04-09 07:01:58 -07:00
Andreas Huber
c944cbe28e Support for ID3 V2.4 tags. 
Change-Id: I74ee02451bdfd7e50f0d5ff6fa5da5147b683e4c
related-to-bug: 2581869
 2010-04-08 14:09:54 -07:00
Andreas Huber
6bd70017bd am 3bf36221: am 3eade67b: am b52e9f74: am eb12e45f: Merge "Refactor connection/redirection code, support redirects on reconnection." into froyo 2010-04-08 13:56:19 -07:00
Andreas Huber
aba965fdd8 Refactor connection/redirection code, support redirects on reconnection. 
Change-Id: Id2517568000e028b01553c06a4893813a6883168
related-to-bug: 2580785
 2010-04-08 10:09:35 -07:00
Andreas Huber
2b330b448d am 604c0371: am c63c6e97: am d06c435c: am c6c8a1e9: Merge "Increase the size of the pages used in CachingDataSource (total amount of memory used remains the same) to compensate for reduced locality of audio/video data requests. Also fixes a mistaken trailing "\r\n" in 2010-04-08 08:47:37 -07:00
Andreas Huber
a51250bdc7 Increase the size of the pages used in CachingDataSource (total amount of memory used remains the same) to compensate for reduced locality of audio/video data requests. Also fixes a mistaken trailing "\r\n" in the range header and better error handling on http connection. 
Change-Id: Ic9a6ef204362bc9afdc61e081c76bc62e5ef92ad
related-to-bug: 2580785
 2010-04-08 07:51:20 -07:00
Marco Nelissen
b4c1d0edea am 92431300: am 724f3008: am ca9a083b: am e43e563e: Merge "Don\'t check whether a specific named activity supports mp3 playback, just that there is at least one that does. Fixes bug 2534382. Change-Id: I00d9ac49bd91f161388d5c3de47b1b6abe9e8d9c" into froyo 2010-04-07 13:53:07 -07:00
Ray Chen
f974b84b54 am e4b62c23: am 84d12f3f: am dbad286c: am 25c2dd60: Merge "Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener http://2553871" into froyo 2010-04-07 13:52:52 -07:00
Marco Nelissen
e43e563e73 Merge "Don't check whether a specific named activity supports mp3 playback, just that there is at least one that does. Fixes bug 2534382. Change-Id: I00d9ac49bd91f161388d5c3de47b1b6abe9e8d9c" into froyo 2010-04-07 13:28:51 -07:00
Ray Chen
25c2dd60d4 Merge "Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener http://2553871" into froyo 2010-04-07 12:05:58 -07:00