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

1573 Commits

Author SHA1 Message Date
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
Andreas Huber
5294f14ce2 am 1bf6cb72: am 1e6edab6: am 01f78928: am 567b57b6: Merge "Report the requested seek time while seek is in progress." into froyo 2010-04-07 11:12:15 -07:00
Marco Nelissen
97a9c6a7bb 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
 2010-04-07 10:40:39 -07:00
Andreas Huber
ddb709c45e Report the requested seek time while seek is in progress. 
Change-Id: I862bfb801701f9ce54dede51c492e4eb37591894
related-to-bug: 2576102
 2010-04-07 10:35:18 -07:00
Ray Chen
b7c8c76180 Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener 
http://2553871

Change-Id: I293b8138a2c23ea107b634da014902f838966c0e
 2010-04-07 10:14:04 -07:00
Andreas Huber
ba56799fb9 am b93ae7ea: am 3e8b89bd: am 2be77a22: Merge "Partial revert of previous change to improve hardware AAC decoder performance, increasing the input buffer size so dramatically accidentally broke streaming performance." into froyo 2010-04-06 14:57:43 -07:00
Andreas Huber
548b7999fe Partial revert of previous change to improve hardware AAC decoder performance, increasing the input buffer size so dramatically accidentally broke streaming performance. 
Change-Id: I14e9fbc1fdff61bcf89218d83cb1d2e3d6eb8438
related-to-bug: 2574491
 2010-04-06 14:36:23 -07:00
Ray Chen
505a318eae am 507748e9: am 6c935602: am 44dcf658: Make createVideoThumbnail and createImageThumbnail look consistent. 2010-04-05 13:30:13 -07:00
Ray Chen
44dcf65871 Make createVideoThumbnail and createImageThumbnail look consistent. 
Change-Id: I9a4798fefe3968ac847d46100036a6dde39791c9
 2010-04-05 13:06:39 -07:00
Andreas Huber
04506177a3 am e47009aa: am 0f7c543c: am eb6e3edc: Merge "Coalesce multiple encoded AAC frames into a single input buffer on this particular OMX codec to increase throughput significantly." into froyo 2010-04-02 14:20:17 -07:00
Andreas Huber
eb6e3edc0f Merge "Coalesce multiple encoded AAC frames into a single input buffer on this particular OMX codec to increase throughput significantly." into froyo 2010-04-02 14:03:46 -07:00
Andreas Huber
a4357addf6 Coalesce multiple encoded AAC frames into a single input buffer on this particular OMX codec to increase throughput significantly. 
Change-Id: I90c7db6656a53339c5d454336548c4f00d0d9064
related-to-bug: 2548426
 2010-04-02 12:55:31 -07:00
Andreas Huber
9702a03b75 am 1f857164: am f0e62b7a: am 29039dee: Merge "Support another kind of iso mpeg4 file." into froyo 2010-04-02 11:32:48 -07:00
Andreas Huber
29039deea9 Merge "Support another kind of iso mpeg4 file." into froyo 2010-04-02 11:18:32 -07:00
Jean-Michel Trivi
5a3a3b16ba am 055897ac: am 28525488: am 9ab05fff: Merge "Fix bug 2565463 Ensure an object cannot appear twice in the AudioFocus stack. Enforce parameter check in AudioManager.requestAudioFocus() Typo correction in AudioService.unregisterMediaButtonEventReceiver()" into froyo 2010-04-02 09:28:50 -07:00