ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
14,920 Commits 2 Branches 0 Tags 54 MiB
8d3347ee59
Commit Graph

14920 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Huber
8d3347ee59 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
272240be3c 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
Gilles Debunne
7bcbe8cf20 Merge "Added documentation in Drawable." 2010-04-12 17:22:14 -07:00
Andreas Huber
ae630622bf 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
Andreas Huber
958a290a7c 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 '5baa5e1917ba4a212fa280b8b6cc3bbbf9382194' into froyo-plus-aosp

* commit '5baa5e1917ba4a212fa280b8b6cc3bbbf9382194':
  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:18:43 -07:00
Andreas Huber
692dc8a970 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:15:32 -07:00
android-build SharedAccount
c7bd32417d am e413fc11: manual merge 2010-04-12 17:01:36 -07:00
android-build SharedAccount
a54069e21f manual merge 
Change-Id: I4760b8fd2f4150441dbf15a598a6b44d9af27621
 2010-04-12 16:56:30 -07:00
Christopher Tate
b3815412f0 am 6a75d685: am 7e8614a5: Merge "SDK: more backup/restore documentation work" into froyo 
Merge commit '6a75d6850c77fb48daba7700621856605ab60569' into kraken

* commit '6a75d6850c77fb48daba7700621856605ab60569':
  SDK: more backup/restore documentation work
 2010-04-12 16:23:35 -07:00
Christopher Tate
39cdc3ceb7 am 7e8614a5: Merge "SDK: more backup/restore documentation work" into froyo 
Merge commit '7e8614a547eca78dd9178001f8f6c38444adf350' into froyo-plus-aosp

* commit '7e8614a547eca78dd9178001f8f6c38444adf350':
  SDK: more backup/restore documentation work
 2010-04-12 16:18:16 -07:00
Scott Main
d6ec37dcb3 am 10bb4990: am 3f371793: Merge "docs: fix bug 2590728" into froyo 
Merge commit '10bb4990f3b13070e6cb7ec98761041679551338' into kraken

* commit '10bb4990f3b13070e6cb7ec98761041679551338':
  docs: fix bug 2590728
 2010-04-12 16:15:42 -07:00
Christopher Tate
f8654c9278 Merge "SDK: more backup/restore documentation work" into froyo 2010-04-12 16:14:53 -07:00
Scott Main
03960f16dd am 3f371793: Merge "docs: fix bug 2590728" into froyo 
Merge commit '3f371793287b6f10badc018fb9eaca33ac51a8e7' into froyo-plus-aosp

* commit '3f371793287b6f10badc018fb9eaca33ac51a8e7':
  docs: fix bug 2590728
 2010-04-12 16:12:24 -07:00
Scott Main
e8cfa791e3 Merge "docs: fix bug 2590728" into froyo 2010-04-12 16:09:28 -07:00
Jean-Baptiste Queru
e668eb3e5d am cd839752: manual merge 2010-04-12 15:38:08 -07:00
Gilles Debunne
223a2af0f0 Merge "Fixed links in MipmapDrawable documentation." 2010-04-12 15:36:59 -07:00
Jean-Baptiste Queru
41c04c89b0 manual merge 
Change-Id: I9cdacbf1e445e7f6cf06ad03df541a744c242774
 2010-04-12 15:32:13 -07:00
Christopher Tate
46ef879aeb am 7fef3c57: am b9e3e4ce: Merge "API CHANGE: remove obsolete constants and hide some methods" into froyo 
Merge commit '7fef3c57eb6f5fbef65dd553ea49d93111d595da' into kraken

* commit '7fef3c57eb6f5fbef65dd553ea49d93111d595da':
  API CHANGE: remove obsolete constants and hide some methods
 2010-04-12 15:19:16 -07:00
Christopher Tate
7e017fd292 am b9e3e4ce: Merge "API CHANGE: remove obsolete constants and hide some methods" into froyo 
Merge commit 'b9e3e4ce7e8e57a28ce15680d406c83cba1eb63a' into froyo-plus-aosp

* commit 'b9e3e4ce7e8e57a28ce15680d406c83cba1eb63a':
  API CHANGE: remove obsolete constants and hide some methods
 2010-04-12 15:16:07 -07:00
Christopher Tate
5bc83acfd3 Merge "API CHANGE: remove obsolete constants and hide some methods" into froyo 2010-04-12 15:13:35 -07:00
android-build SharedAccount
3ebc09fa3b am 1a22ec9f: Merge commit \'36c87ca65281bbbeeed1b25da52468fe52491a7d\' into kraken-plus-aosp 2010-04-12 14:50:14 -07:00
android-build SharedAccount
05b957d10a am 270027bf: Merge commit \'e8985420bb0fb95ad6dadd6de84f9940ecbd5ab7\' into kraken-plus-aosp 2010-04-12 14:50:10 -07:00
android-build SharedAccount
089582b02a Merge commit '36c87ca65281bbbeeed1b25da52468fe52491a7d' into kraken-plus-aosp 2010-04-12 14:47:38 -07:00
android-build SharedAccount
b48ef07019 Merge commit 'e8985420bb0fb95ad6dadd6de84f9940ecbd5ab7' into kraken-plus-aosp 2010-04-12 14:46:11 -07:00
Andreas Huber
c6a57ec8c1 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
c6f8d526cc 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 '6dbf80d086d03d95c5f6331719edd6dd6dac0361' into froyo-plus-aosp

* commit '6dbf80d086d03d95c5f6331719edd6dd6dac0361':
  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:19:23 -07:00
Andreas Huber
0e8ff0cb11 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
Kenny Root
6ed060d915 am 5b0fb521: am 290a48b3: Merge "Fix typos in name of density-independent pixels" into froyo 
Merge commit '5b0fb521e6af1ca61141daa3d86f97fd6343f5e4' into kraken

* commit '5b0fb521e6af1ca61141daa3d86f97fd6343f5e4':
  Fix typos in name of density-independent pixels
 2010-04-12 12:24:51 -07:00
Kenny Root
b138a55e8e am 290a48b3: Merge "Fix typos in name of density-independent pixels" into froyo 
Merge commit '290a48b365479eccd16023b5de0d92063bb68b4d' into froyo-plus-aosp

* commit '290a48b365479eccd16023b5de0d92063bb68b4d':
  Fix typos in name of density-independent pixels
 2010-04-12 12:20:50 -07:00
Kenny Root
e85658ea34 Merge "Fix typos in name of density-independent pixels" into froyo 2010-04-12 12:19:08 -07:00
Jean-Michel Trivi
c8cd1dc882 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
82c11703dd 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. This CL corr 
Merge commit '12221b6f7c86349e3dcf89f814355e41f9e58cbf' into froyo-plus-aosp

* commit '12221b6f7c86349e3dcf89f814355e41f9e58cbf':
  Fix monkey bug 2586534 java.util.ConcurrentModificationException
 2010-04-12 12:07:44 -07:00
Jean-Michel Trivi
44eddf8514 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
Patrick Scott
714004ede7 am c9eaa3cb: am 36acfbc2: Add a bulk request method for bookmark icons. 
Merge commit 'c9eaa3cbb0d6152cd156a9e66ef23389042b48b5' into kraken

* commit 'c9eaa3cbb0d6152cd156a9e66ef23389042b48b5':
  Add a bulk request method for bookmark icons.
 2010-04-12 11:55:53 -07:00
Patrick Scott
6aa83d7665 am 36acfbc2: Add a bulk request method for bookmark icons. 
Merge commit '36acfbc2b8df6e62f2d583933eca3a49265279a6' into froyo-plus-aosp

* commit '36acfbc2b8df6e62f2d583933eca3a49265279a6':
  Add a bulk request method for bookmark icons.
 2010-04-12 11:53:09 -07:00
Fabrice Di Meglio
4ffad344dd Merge "Fix bug #2585298 (google calendar sync clears eventTimezone field for recurring allDay events)" 2010-04-12 11:42:20 -07:00
Andreas Huber
49e567f537 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
bbf1085cd2 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 '1d7a8b448e9371685894b6b02d29bcd3ae959545' into froyo-plus-aosp

* commit '1d7a8b448e9371685894b6b02d29bcd3ae959545':
  Fix a case where the aac hardware decoder is in a transition state and refused a fillbuffer request.
 2010-04-12 11:05:36 -07:00
Andreas Huber
2f16b634d0 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
ddd6d87bde Merge "Remove unnecessary lock from AMRWriter." into kraken 2010-04-12 11:05:09 -07:00
Andreas Huber
9acdf61fbb Merge "Various fixes to enable recording on passion and nexus1." into kraken 2010-04-12 11:04:57 -07:00
Andreas Huber
16c57d0da1 Merge "Remove legacy NO_OPENCORE code bypass from MediaPlayerService." into kraken 2010-04-12 11:04:46 -07:00
Andreas Huber
128cbf2812 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
e364a2acbe am 10d40772: am cdded187: Merge "Ignore corrupt aac audio frames and substitute silence." into froyo 
Merge commit '10d4077240fe17b3a0c0e16a6e3f9d5e66419ba0' into kraken

* commit '10d4077240fe17b3a0c0e16a6e3f9d5e66419ba0':
  Ignore corrupt aac audio frames and substitute silence.
 2010-04-12 10:16:11 -07:00
Andreas Huber
1d00c7910b am b1e7bee2: am 040301ca: Start sending out buffering updates earlier (after preparation has completed) instead of only after playback has started. 
Merge commit 'b1e7bee2f3537bf5c49d1de796a97d2c2a48ebd4' into kraken

* commit 'b1e7bee2f3537bf5c49d1de796a97d2c2a48ebd4':
  Start sending out buffering updates earlier (after preparation has completed) instead of only after playback has started.
 2010-04-12 10:16:08 -07:00
Andreas Huber
d073b6b210 am cdded187: Merge "Ignore corrupt aac audio frames and substitute silence." into froyo 
Merge commit 'cdded187d20bdc6379c5a09bdd2002fa070b745d' into froyo-plus-aosp

* commit 'cdded187d20bdc6379c5a09bdd2002fa070b745d':
  Ignore corrupt aac audio frames and substitute silence.
 2010-04-12 10:14:08 -07:00
Andreas Huber
8a503c1d4c am 040301ca: Start sending out buffering updates earlier (after preparation has completed) instead of only after playback has started. 
Merge commit '040301cad17e447d760e7b7e54b79c8c294415ea' into froyo-plus-aosp

* commit '040301cad17e447d760e7b7e54b79c8c294415ea':
  Start sending out buffering updates earlier (after preparation has completed) instead of only after playback has started.
 2010-04-12 10:12:29 -07:00
Andreas Huber
66143c02c1 Merge "Ignore corrupt aac audio frames and substitute silence." into froyo 2010-04-12 10:11:32 -07:00
Leon Scroggins
844bb8abb1 am 6636ff18: am fac110dc: am 853a4240: am 63284ede: Do not check mWebTextView\'s focus state to determine editing mode. 2010-04-12 08:20:23 -07:00
Leon Scroggins
f701b0d09c am fac110dc: am 853a4240: am 63284ede: Do not check mWebTextView\'s focus state to determine editing mode. 2010-04-12 08:17:38 -07:00