OSDN Git Service
Christopher Tate [Mon, 12 Apr 2010 22:19:16 +0000 (15:19 -0700)]
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
Christopher Tate [Mon, 12 Apr 2010 22:16:07 +0000 (15:16 -0700)]
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
Christopher Tate [Mon, 12 Apr 2010 22:13:35 +0000 (15:13 -0700)]
Merge "API CHANGE: remove obsolete constants and hide some methods" into froyo
Andreas Huber [Mon, 12 Apr 2010 21:23:31 +0000 (14:23 -0700)]
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.
Andreas Huber [Mon, 12 Apr 2010 21:19:23 +0000 (14:19 -0700)]
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.
Andreas Huber [Mon, 12 Apr 2010 21:16:34 +0000 (14:16 -0700)]
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
Kenny Root [Mon, 12 Apr 2010 19:24:51 +0000 (12:24 -0700)]
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
Kenny Root [Mon, 12 Apr 2010 19:20:50 +0000 (12:20 -0700)]
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
Kenny Root [Mon, 12 Apr 2010 19:19:08 +0000 (12:19 -0700)]
Merge "Fix typos in name of density-independent pixels" into froyo
Jean-Michel Trivi [Mon, 12 Apr 2010 19:11:54 +0000 (12:11 -0700)]
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
Jean-Michel Trivi [Mon, 12 Apr 2010 19:07:44 +0000 (12:07 -0700)]
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
Jean-Michel Trivi [Mon, 12 Apr 2010 19:05:08 +0000 (12:05 -0700)]
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
Patrick Scott [Mon, 12 Apr 2010 18:55:53 +0000 (11:55 -0700)]
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.
Patrick Scott [Mon, 12 Apr 2010 18:53:09 +0000 (11:53 -0700)]
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.
Andreas Huber [Mon, 12 Apr 2010 18:07:54 +0000 (11:07 -0700)]
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.
Andreas Huber [Mon, 12 Apr 2010 18:05:36 +0000 (11:05 -0700)]
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.
Andreas Huber [Mon, 12 Apr 2010 18:05:22 +0000 (11:05 -0700)]
Merge "I accidentally broken passion encoding while working around problems with the sholes encoder." into kraken
Andreas Huber [Mon, 12 Apr 2010 18:05:09 +0000 (11:05 -0700)]
Merge "Remove unnecessary lock from AMRWriter." into kraken
Andreas Huber [Mon, 12 Apr 2010 18:04:57 +0000 (11:04 -0700)]
Merge "Various fixes to enable recording on passion and nexus1." into kraken
Andreas Huber [Mon, 12 Apr 2010 18:04:46 +0000 (11:04 -0700)]
Merge "Remove legacy NO_OPENCORE code bypass from MediaPlayerService." into kraken
Andreas Huber [Mon, 12 Apr 2010 18:02:27 +0000 (11:02 -0700)]
Merge "Fix a case where the aac hardware decoder is in a transition state and refused a fillbuffer request." into froyo
Andreas Huber [Mon, 12 Apr 2010 17:16:11 +0000 (10:16 -0700)]
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.
Andreas Huber [Mon, 12 Apr 2010 17:16:08 +0000 (10:16 -0700)]
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.
Andreas Huber [Mon, 12 Apr 2010 17:14:08 +0000 (10:14 -0700)]
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.
Andreas Huber [Mon, 12 Apr 2010 17:12:29 +0000 (10:12 -0700)]
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.
Andreas Huber [Mon, 12 Apr 2010 17:11:32 +0000 (10:11 -0700)]
Merge "Ignore corrupt aac audio frames and substitute silence." into froyo
Leon Scroggins [Mon, 12 Apr 2010 15:14:35 +0000 (08:14 -0700)]
am
853a4240: am
63284ede: Do not check mWebTextView\'s focus state to determine editing mode.
Merge commit '
853a42409b34b3aff118c7a09e390477247d002b' into kraken
* commit '
853a42409b34b3aff118c7a09e390477247d002b':
Do not check mWebTextView's focus state to determine editing mode.
Leon Scroggins [Mon, 12 Apr 2010 15:11:40 +0000 (08:11 -0700)]
am
63284ede: Do not check mWebTextView\'s focus state to determine editing mode.
Merge commit '
63284ede623ca8a4119f1f44b86fbf017faba8dc' into froyo-plus-aosp
* commit '
63284ede623ca8a4119f1f44b86fbf017faba8dc':
Do not check mWebTextView's focus state to determine editing mode.
Wu-cheng Li [Sat, 10 Apr 2010 18:48:24 +0000 (11:48 -0700)]
am
08caa704: am
c58b4232: Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF.
Merge commit '
08caa704ae6c1dd8434186fa2dc22b1d7f8a5f9c' into kraken
* commit '
08caa704ae6c1dd8434186fa2dc22b1d7f8a5f9c':
Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF.
Scott Main [Sat, 10 Apr 2010 18:48:20 +0000 (11:48 -0700)]
am
67d6590d: am
2a547829: Merge "cherry-pick from master: Icf079f5f45b1745a8d54f504e28dbbb52c6f7c96 docs: rewrite resources documentation" into froyo
Merge commit '
67d6590d242397acbb95814139301d2e6efd3631' into kraken
* commit '
67d6590d242397acbb95814139301d2e6efd3631':
cherry-pick from master: Icf079f5f45b1745a8d54f504e28dbbb52c6f7c96
Dianne Hackborn [Sat, 10 Apr 2010 18:48:15 +0000 (11:48 -0700)]
am
06af7620: am
17de1532: Merge "Fix issue #
2581524: Car home icon should always go to car home" into froyo
Merge commit '
06af762033467bb578b9ed2be8af580cc11505a8' into kraken
* commit '
06af762033467bb578b9ed2be8af580cc11505a8':
Fix issue #
2581524: Car home icon should always go to car home
Robert Greenwalt [Sat, 10 Apr 2010 18:48:11 +0000 (11:48 -0700)]
am
52ebff3c: am
5cc07252: Merge "Add warning magic to be a bit more reasonable." into froyo
Merge commit '
52ebff3c47eb3fcd43d0337a43312240f7d2010e' into kraken
* commit '
52ebff3c47eb3fcd43d0337a43312240f7d2010e':
Add warning magic to be a bit more reasonable.
Yu Shan Emily Lau [Sat, 10 Apr 2010 18:48:06 +0000 (11:48 -0700)]
am
6e40664f: am
15b02f04: Merge "Remove the checkStremingServer checking as it is unstable and introduce the flakiness." into froyo
Merge commit '
6e40664fc75e25ebeafda883fc2bba27279bebdd' into kraken
* commit '
6e40664fc75e25ebeafda883fc2bba27279bebdd':
Remove the checkStremingServer checking as it is unstable and introduce the flakiness.
Romain Guy [Sat, 10 Apr 2010 18:48:02 +0000 (11:48 -0700)]
am
376722fc: am
4525c981: Merge "Fix regression introduced when fixing focus issue with ScrollView. Bug #
2581646" into froyo
Merge commit '
376722fcdf41ade7286bcdb757564559d35a4976' into kraken
* commit '
376722fcdf41ade7286bcdb757564559d35a4976':
Fix regression introduced when fixing focus issue with ScrollView.
Wink Saville [Sat, 10 Apr 2010 18:47:57 +0000 (11:47 -0700)]
am
19fe70cb: am
a18c824c: Merge "Fix a FATAL ClassCastException in DataConnection.java" into froyo
Merge commit '
19fe70cbe70615d2d639fec2a2a3ab35d00d43ef' into kraken
* commit '
19fe70cbe70615d2d639fec2a2a3ab35d00d43ef':
Fix a FATAL ClassCastException in DataConnection.java
Wei Huang [Sat, 10 Apr 2010 18:47:51 +0000 (11:47 -0700)]
am
997b3803: am
c621b65d: Merge "bug #
2542580: add the appropriate mdpi asset for chat icon." into froyo
Merge commit '
997b38036f5ac5db69191d090c8c3c1d1b05aace' into kraken
* commit '
997b38036f5ac5db69191d090c8c3c1d1b05aace':
bug #
2542580: add the appropriate mdpi asset for chat icon.
Jesse Wilson [Sat, 10 Apr 2010 18:47:45 +0000 (11:47 -0700)]
am
f9e90378: am
bc284a5f: Merge "Move the public method HttpDateTime.parse() into AndroidHttpClient." into froyo
Merge commit '
f9e90378d50210298d1cec2b913653597cd62be4' into kraken
* commit '
f9e90378d50210298d1cec2b913653597cd62be4':
Move the public method HttpDateTime.parse() into AndroidHttpClient.
Mike Reed [Sat, 10 Apr 2010 18:47:40 +0000 (11:47 -0700)]
am
58d50183: am
a3c4c219: Merge "final versions of these fonts from ascender, including GPOS \'mark\' feature" into froyo
Merge commit '
58d50183bc7c125db76f5ca8f76816ebb9f19d17' into kraken
* commit '
58d50183bc7c125db76f5ca8f76816ebb9f19d17':
final versions of these fonts from ascender, including GPOS 'mark' feature
Robert Greenwalt [Sat, 10 Apr 2010 18:47:35 +0000 (11:47 -0700)]
am
090af2c5: am
4dceedc1: Merge "Make ThrottleService notice policy changes." into froyo
Merge commit '
090af2c57024b1ac0ba2ce0ecbc8e4e814c98c8b' into kraken
* commit '
090af2c57024b1ac0ba2ce0ecbc8e4e814c98c8b':
Make ThrottleService notice policy changes.
Dan Egnor [Sat, 10 Apr 2010 18:47:29 +0000 (11:47 -0700)]
am
505f22d1: am
2d3df559: Merge "Fix sim build (sim doesn\'t have strl*() reliably...)" into froyo
Merge commit '
505f22d1a4dbf1fceaf8deca443d7322386964e1' into kraken
* commit '
505f22d1a4dbf1fceaf8deca443d7322386964e1':
Fix sim build (sim doesn't have strl*() reliably...)
Kristian Monsen [Sat, 10 Apr 2010 18:47:23 +0000 (11:47 -0700)]
am
d25fb8db: am
34959e3f: Merge "Do not create intents for application/xhtml+xml" into froyo
Merge commit '
d25fb8db8de213feb55cdfff087eabc6ee865f31' into kraken
* commit '
d25fb8db8de213feb55cdfff087eabc6ee865f31':
Do not create intents for application/xhtml+xml
Grace Kloba [Sat, 10 Apr 2010 18:47:15 +0000 (11:47 -0700)]
am
210462e5: am
e67e6b94: Merge "Set mHeldMotionless to a new MOTIONLESS_IGNORE state for fling, this way we will trigger animateScroll during fling for the faster performance. We also avoid keep removing/sending DRAG_HELD_MOTIONLESS message during fling." into froyo
Merge commit '
210462e57762be9bb016b4d05374cae5f48b5aea' into kraken
* commit '
210462e57762be9bb016b4d05374cae5f48b5aea':
Set mHeldMotionless to a new MOTIONLESS_IGNORE state
Wu-cheng Li [Sat, 10 Apr 2010 18:42:15 +0000 (11:42 -0700)]
am
c58b4232: Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF.
Merge commit '
c58b42327df5fbc826e2fcc2674ab6db0edfcd92' into froyo-plus-aosp
* commit '
c58b42327df5fbc826e2fcc2674ab6db0edfcd92':
Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF.
Scott Main [Sat, 10 Apr 2010 18:42:10 +0000 (11:42 -0700)]
am
2a547829: Merge "cherry-pick from master: Icf079f5f45b1745a8d54f504e28dbbb52c6f7c96 docs: rewrite resources documentation" into froyo
Merge commit '
2a547829fe162c52ea1b1168f47d25fb1b40497d' into froyo-plus-aosp
* commit '
2a547829fe162c52ea1b1168f47d25fb1b40497d':
cherry-pick from master: Icf079f5f45b1745a8d54f504e28dbbb52c6f7c96
Dianne Hackborn [Sat, 10 Apr 2010 18:42:05 +0000 (11:42 -0700)]
am
17de1532: Merge "Fix issue #
2581524: Car home icon should always go to car home" into froyo
Merge commit '
17de1532a950f7ee961debab93a7977292b7f1f3' into froyo-plus-aosp
* commit '
17de1532a950f7ee961debab93a7977292b7f1f3':
Fix issue #
2581524: Car home icon should always go to car home
Robert Greenwalt [Sat, 10 Apr 2010 18:42:02 +0000 (11:42 -0700)]
am
5cc07252: Merge "Add warning magic to be a bit more reasonable." into froyo
Merge commit '
5cc072522b51f796085a73545a3dd34a02877059' into froyo-plus-aosp
* commit '
5cc072522b51f796085a73545a3dd34a02877059':
Add warning magic to be a bit more reasonable.
Yu Shan Emily Lau [Sat, 10 Apr 2010 18:41:58 +0000 (11:41 -0700)]
am
15b02f04: Merge "Remove the checkStremingServer checking as it is unstable and introduce the flakiness." into froyo
Merge commit '
15b02f04c7b5e895dd8ebbb9448863a7d608b00f' into froyo-plus-aosp
* commit '
15b02f04c7b5e895dd8ebbb9448863a7d608b00f':
Remove the checkStremingServer checking as it is unstable and introduce the flakiness.
Romain Guy [Sat, 10 Apr 2010 18:41:54 +0000 (11:41 -0700)]
am
4525c981: Merge "Fix regression introduced when fixing focus issue with ScrollView. Bug #
2581646" into froyo
Merge commit '
4525c98114c1e570ecef84521f66095e866af77d' into froyo-plus-aosp
* commit '
4525c98114c1e570ecef84521f66095e866af77d':
Fix regression introduced when fixing focus issue with ScrollView.
Wink Saville [Sat, 10 Apr 2010 18:41:50 +0000 (11:41 -0700)]
am
a18c824c: Merge "Fix a FATAL ClassCastException in DataConnection.java" into froyo
Merge commit '
a18c824c029c14093b3d06d0a021c5397be667fb' into froyo-plus-aosp
* commit '
a18c824c029c14093b3d06d0a021c5397be667fb':
Fix a FATAL ClassCastException in DataConnection.java
Wei Huang [Sat, 10 Apr 2010 18:41:45 +0000 (11:41 -0700)]
am
c621b65d: Merge "bug #
2542580: add the appropriate mdpi asset for chat icon." into froyo
Merge commit '
c621b65d2f4ac88174fb98d2ed9a6b0d06fde4da' into froyo-plus-aosp
* commit '
c621b65d2f4ac88174fb98d2ed9a6b0d06fde4da':
bug #
2542580: add the appropriate mdpi asset for chat icon.
Jesse Wilson [Sat, 10 Apr 2010 18:41:38 +0000 (11:41 -0700)]
am
bc284a5f: Merge "Move the public method HttpDateTime.parse() into AndroidHttpClient." into froyo
Merge commit '
bc284a5f9f1e3f19ddd45cfb233f0d1775b612a7' into froyo-plus-aosp
* commit '
bc284a5f9f1e3f19ddd45cfb233f0d1775b612a7':
Move the public method HttpDateTime.parse() into AndroidHttpClient.
Mike Reed [Sat, 10 Apr 2010 18:41:30 +0000 (11:41 -0700)]
am
a3c4c219: Merge "final versions of these fonts from ascender, including GPOS \'mark\' feature" into froyo
Merge commit '
a3c4c219c21e61ca4a642a35610dea07c437a647' into froyo-plus-aosp
* commit '
a3c4c219c21e61ca4a642a35610dea07c437a647':
final versions of these fonts from ascender, including GPOS 'mark' feature
Robert Greenwalt [Sat, 10 Apr 2010 18:41:25 +0000 (11:41 -0700)]
am
4dceedc1: Merge "Make ThrottleService notice policy changes." into froyo
Merge commit '
4dceedc133ef0487577badb67100d20473d87762' into froyo-plus-aosp
* commit '
4dceedc133ef0487577badb67100d20473d87762':
Make ThrottleService notice policy changes.
Dan Egnor [Sat, 10 Apr 2010 18:41:20 +0000 (11:41 -0700)]
am
2d3df559: Merge "Fix sim build (sim doesn\'t have strl*() reliably...)" into froyo
Merge commit '
2d3df559dea9ebb0ab263c2df26e8a345ed74d12' into froyo-plus-aosp
* commit '
2d3df559dea9ebb0ab263c2df26e8a345ed74d12':
Fix sim build (sim doesn't have strl*() reliably...)
Kristian Monsen [Sat, 10 Apr 2010 18:41:14 +0000 (11:41 -0700)]
am
34959e3f: Merge "Do not create intents for application/xhtml+xml" into froyo
Merge commit '
34959e3fe87012d554af07fd6ad294b2ce3daea7' into froyo-plus-aosp
* commit '
34959e3fe87012d554af07fd6ad294b2ce3daea7':
Do not create intents for application/xhtml+xml
Grace Kloba [Sat, 10 Apr 2010 18:41:09 +0000 (11:41 -0700)]
am
e67e6b94: Merge "Set mHeldMotionless to a new MOTIONLESS_IGNORE state for fling, this way we will trigger animateScroll during fling for the faster performance. We also avoid keep removing/sending DRAG_HELD_MOTIONLESS message during fling." into froyo
Merge commit '
e67e6b94fd282283f1ffa2299fae536bee099715' into froyo-plus-aosp
* commit '
e67e6b94fd282283f1ffa2299fae536bee099715':
Set mHeldMotionless to a new MOTIONLESS_IGNORE state
Scott Main [Sat, 10 Apr 2010 00:03:55 +0000 (17:03 -0700)]
Merge "cherry-pick from master: Icf079f5f45b1745a8d54f504e28dbbb52c6f7c96 docs: rewrite resources documentation" into froyo
Dianne Hackborn [Fri, 9 Apr 2010 23:52:41 +0000 (16:52 -0700)]
Merge "Fix issue #
2581524: Car home icon should always go to car home" into froyo
Robert Greenwalt [Fri, 9 Apr 2010 23:47:10 +0000 (16:47 -0700)]
Merge "Add warning magic to be a bit more reasonable." into froyo
Yu Shan Emily Lau [Fri, 9 Apr 2010 23:41:37 +0000 (16:41 -0700)]
Merge "Remove the checkStremingServer checking as it is unstable and introduce the flakiness." into froyo
Romain Guy [Fri, 9 Apr 2010 23:08:17 +0000 (16:08 -0700)]
Merge "Fix regression introduced when fixing focus issue with ScrollView. Bug #
2581646" into froyo
Wink Saville [Fri, 9 Apr 2010 22:39:33 +0000 (15:39 -0700)]
Merge "Fix a FATAL ClassCastException in DataConnection.java" into froyo
Wei Huang [Fri, 9 Apr 2010 22:34:46 +0000 (15:34 -0700)]
Merge "bug #
2542580: add the appropriate mdpi asset for chat icon." into froyo
Mathias Agopian [Fri, 9 Apr 2010 21:28:03 +0000 (14:28 -0700)]
Merge "small cleanup. gEGLImpl should have been static" into kraken
Mathias Agopian [Fri, 9 Apr 2010 20:37:34 +0000 (13:37 -0700)]
small cleanup. gEGLImpl should have been static
also added a ctor to initialized it in case we use it ont he stack
one day.
Change-Id: I2736b9bce3d8ba3b74fd029de4c18cca2cdbbf60
Jesse Wilson [Fri, 9 Apr 2010 21:01:07 +0000 (14:01 -0700)]
Merge "Move the public method HttpDateTime.parse() into AndroidHttpClient." into froyo
Jesse Wilson [Thu, 8 Apr 2010 21:20:57 +0000 (14:20 -0700)]
Move the public method HttpDateTime.parse() into AndroidHttpClient.
See bug http://b/
2553589
Change-Id: Ide3399c7c63daf9c0b8c18669076f2f4d6e9a876
Mike Reed [Fri, 9 Apr 2010 20:10:07 +0000 (13:10 -0700)]
Merge "final versions of these fonts from ascender, including GPOS 'mark' feature" into froyo
Robert Greenwalt [Fri, 9 Apr 2010 20:00:05 +0000 (13:00 -0700)]
Merge "Make ThrottleService notice policy changes." into froyo
Dan Egnor [Fri, 9 Apr 2010 19:50:11 +0000 (12:50 -0700)]
Merge "Fix sim build (sim doesn't have strl*() reliably...)" into froyo
Kristian Monsen [Fri, 9 Apr 2010 17:59:20 +0000 (10:59 -0700)]
Merge "Do not create intents for application/xhtml+xml" into froyo
Grace Kloba [Fri, 9 Apr 2010 17:49:42 +0000 (10:49 -0700)]
Merge "Set mHeldMotionless to a new MOTIONLESS_IGNORE state for fling, this way we will trigger animateScroll during fling for the faster performance. We also avoid keep removing/sending DRAG_HELD_MOTIONLESS message during fling." into froyo
Robert Greenwalt [Fri, 9 Apr 2010 16:35:55 +0000 (09:35 -0700)]
am
a68780dd: am
cb270410: Merge "Roaming data doesn\'t count against limits" into froyo
Merge commit '
a68780dd0f0af0938b72fdf6539db575da471028' into kraken
* commit '
a68780dd0f0af0938b72fdf6539db575da471028':
Roaming data doesn't count against limits
Robert Greenwalt [Fri, 9 Apr 2010 16:32:03 +0000 (09:32 -0700)]
am
cb270410: Merge "Roaming data doesn\'t count against limits" into froyo
Merge commit '
cb27041034343a6a15f0812d04f66fefbed30686' into froyo-plus-aosp
* commit '
cb27041034343a6a15f0812d04f66fefbed30686':
Roaming data doesn't count against limits
Robert Greenwalt [Fri, 9 Apr 2010 16:29:20 +0000 (09:29 -0700)]
Merge "Roaming data doesn't count against limits" into froyo
Eric Laurent [Fri, 9 Apr 2010 15:58:30 +0000 (08:58 -0700)]
am
1921527c: am
9da7730d: Merge "Additional fix for isssue
2548710: Native AudioTrack resources never freed." into froyo
Merge commit '
1921527c8dbcb9f10683e43bca12648cb2c6e5b7' into kraken
* commit '
1921527c8dbcb9f10683e43bca12648cb2c6e5b7':
Additional fix for isssue
2548710: Native AudioTrack resources never freed.
Eric Laurent [Fri, 9 Apr 2010 15:53:08 +0000 (08:53 -0700)]
am
9da7730d: Merge "Additional fix for isssue
2548710: Native AudioTrack resources never freed." into froyo
Merge commit '
9da7730d5f97270c356ee86298c5d6d45f39b264' into froyo-plus-aosp
* commit '
9da7730d5f97270c356ee86298c5d6d45f39b264':
Additional fix for isssue
2548710: Native AudioTrack resources never freed.
Eric Laurent [Fri, 9 Apr 2010 15:48:32 +0000 (08:48 -0700)]
Merge "Additional fix for isssue
2548710: Native AudioTrack resources never freed." into froyo
Andreas Huber [Fri, 9 Apr 2010 14:09:49 +0000 (07:09 -0700)]
am
91ce0826: am
4be2461f: Merge "Support for ID3 V2.4 tags." into froyo
Merge commit '
91ce08269600a5b46c84d9480212bf17e1107c2f' into kraken
* commit '
91ce08269600a5b46c84d9480212bf17e1107c2f':
Support for ID3 V2.4 tags.
Andreas Huber [Fri, 9 Apr 2010 14:06:11 +0000 (07:06 -0700)]
am
4be2461f: Merge "Support for ID3 V2.4 tags." into froyo
Merge commit '
4be2461f06de3cf70a3126d2e4590d35210b8397' into froyo-plus-aosp
* commit '
4be2461f06de3cf70a3126d2e4590d35210b8397':
Support for ID3 V2.4 tags.
Andreas Huber [Fri, 9 Apr 2010 14:01:58 +0000 (07:01 -0700)]
Merge "Support for ID3 V2.4 tags." into froyo
Patrick Scott [Fri, 9 Apr 2010 13:43:47 +0000 (06:43 -0700)]
am
54c5330f: am
da9a22bc: Save/restore the picture in a background thread.
Merge commit '
54c5330f23adc0f9928936f44b2d20d327d900c8' into kraken
* commit '
54c5330f23adc0f9928936f44b2d20d327d900c8':
Save/restore the picture in a background thread.
Patrick Scott [Fri, 9 Apr 2010 13:37:11 +0000 (06:37 -0700)]
am
da9a22bc: Save/restore the picture in a background thread.
Merge commit '
da9a22bc5cfd87d80d5afa53fa8c1d29b0407a07' into froyo-plus-aosp
* commit '
da9a22bc5cfd87d80d5afa53fa8c1d29b0407a07':
Save/restore the picture in a background thread.
Eric Laurent [Fri, 9 Apr 2010 13:11:48 +0000 (06:11 -0700)]
Additional fix for isssue
2548710: Native AudioTrack resources never freed.
This changes fixes the issue for the direct output thread that was not
addressed by commit
71f37cd8a175ee00635cb91506d6810fd02b5b51.
Change-Id: I1bbe26be5f444415dd97270e49257650f5d2858f
Dan Egnor [Fri, 9 Apr 2010 06:08:56 +0000 (23:08 -0700)]
am
f5d506d9: am
78158db5: Hail-Mary attempt to avoid apparent blocking problems in readEvents().
Merge commit '
f5d506d92958d43449cb9ef77e6c9b6087e1cd68' into kraken
* commit '
f5d506d92958d43449cb9ef77e6c9b6087e1cd68':
Hail-Mary attempt to avoid apparent blocking problems in readEvents().
Dan Egnor [Fri, 9 Apr 2010 06:04:16 +0000 (23:04 -0700)]
am
78158db5: Hail-Mary attempt to avoid apparent blocking problems in readEvents().
Merge commit '
78158db51029e7dbe160e60af0deb7594bec051d' into froyo-plus-aosp
* commit '
78158db51029e7dbe160e60af0deb7594bec051d':
Hail-Mary attempt to avoid apparent blocking problems in readEvents().
Dan Egnor [Fri, 9 Apr 2010 05:50:50 +0000 (22:50 -0700)]
am
a2bf7343: am
70c294b2: Merge "Fix OperationScheduler moratorium calculation for clock rollback case." into froyo
Merge commit '
a2bf73435ba776de1a55847276fc54c00648971b' into kraken
* commit '
a2bf73435ba776de1a55847276fc54c00648971b':
Fix OperationScheduler moratorium calculation for clock rollback case.
Xavier Ducrohet [Fri, 9 Apr 2010 05:50:46 +0000 (22:50 -0700)]
am
3895007d: am
bbc6e33b: Merge "Adds back the finalize method on the replaced Paint class." into froyo
Merge commit '
3895007d523a9d5c92b971908f898f19a8c9f8ff' into kraken
* commit '
3895007d523a9d5c92b971908f898f19a8c9f8ff':
Adds back the finalize method on the replaced Paint class.
Jeff Brown [Fri, 9 Apr 2010 05:50:42 +0000 (22:50 -0700)]
am
6c099149: am
37d2f5d1: Merge "Remove @link to hidden ACCESS_CACHE_FILESYSTEM permission." into froyo
Merge commit '
6c099149daff56ca04ab40a86950e7b61caf6505' into kraken
* commit '
6c099149daff56ca04ab40a86950e7b61caf6505':
Remove @link to hidden ACCESS_CACHE_FILESYSTEM permission.
Dan Egnor [Fri, 9 Apr 2010 05:39:27 +0000 (22:39 -0700)]
am
70c294b2: Merge "Fix OperationScheduler moratorium calculation for clock rollback case." into froyo
Merge commit '
70c294b205f7b27308c45bf893270bef6081d39b' into froyo-plus-aosp
* commit '
70c294b205f7b27308c45bf893270bef6081d39b':
Fix OperationScheduler moratorium calculation for clock rollback case.
Xavier Ducrohet [Fri, 9 Apr 2010 05:39:24 +0000 (22:39 -0700)]
am
bbc6e33b: Merge "Adds back the finalize method on the replaced Paint class." into froyo
Merge commit '
bbc6e33b1f7fff3280c3fa44836833f4bab4bf99' into froyo-plus-aosp
* commit '
bbc6e33b1f7fff3280c3fa44836833f4bab4bf99':
Adds back the finalize method on the replaced Paint class.
Jeff Brown [Fri, 9 Apr 2010 05:39:19 +0000 (22:39 -0700)]
am
37d2f5d1: Merge "Remove @link to hidden ACCESS_CACHE_FILESYSTEM permission." into froyo
Merge commit '
37d2f5d15b850830d65b1f68ebc95d5ba0612a46' into froyo-plus-aosp
* commit '
37d2f5d15b850830d65b1f68ebc95d5ba0612a46':
Remove @link to hidden ACCESS_CACHE_FILESYSTEM permission.
Mathias Agopian [Fri, 9 Apr 2010 02:10:52 +0000 (19:10 -0700)]
Merge "fix [
2420565] Surface.lockCanvas() updates the dirty region too often" into kraken
Mathias Agopian [Fri, 9 Apr 2010 01:34:07 +0000 (18:34 -0700)]
fix [
2420565] Surface.lockCanvas() updates the dirty region too often
There was a bug where we were we could be reallocating buffers for no reason.
Change-Id: Ieb8a81a289da9339ab7faf987cd3a73428943c1a
Dan Egnor [Fri, 9 Apr 2010 00:38:28 +0000 (17:38 -0700)]
Merge "Fix OperationScheduler moratorium calculation for clock rollback case." into froyo
Dan Egnor [Fri, 9 Apr 2010 00:24:26 +0000 (17:24 -0700)]
Fix OperationScheduler moratorium calculation for clock rollback case.
Make the unit test exercise some clock-rollback scenarios, using
a properly injected artificial clock.
Bug:
2579585
Change-Id: I6f81c32318ba27429bd30ff53b48449218e4ac64
Xavier Ducrohet [Fri, 9 Apr 2010 00:29:39 +0000 (17:29 -0700)]
Merge "Adds back the finalize method on the replaced Paint class." into froyo
Jeff Brown [Fri, 9 Apr 2010 00:18:15 +0000 (17:18 -0700)]
Merge "Remove @link to hidden ACCESS_CACHE_FILESYSTEM permission." into froyo
Irfan Sheriff [Fri, 9 Apr 2010 00:05:06 +0000 (17:05 -0700)]
am
750f3211: am
c9b6851a: Throttling framework addins
Merge commit '
750f32117b96a8af4fb03fae459a80f79a667fca' into kraken
* commit '
750f32117b96a8af4fb03fae459a80f79a667fca':
Throttling framework addins
Irfan Sheriff [Fri, 9 Apr 2010 00:01:59 +0000 (17:01 -0700)]
am
c9b6851a: Throttling framework addins
Merge commit '
c9b6851af68bdc20c4903b16c344e9f116647219' into froyo-plus-aosp
* commit '
c9b6851af68bdc20c4903b16c344e9f116647219':
Throttling framework addins
OSDN Git Service
