21018 Commits

Author SHA1 Message Date
Andreas Huber
98c5bd5556 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
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
Kenny Root
5b0fb521e6 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
290a48b365 Merge "Fix typos in name of density-independent pixels" into froyo 2010-04-12 12:19:08 -07:00
Jean-Michel Trivi
54419a4fc9 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
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
Patrick Scott
c9eaa3cbb0 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
Patrick Scott
36acfbc2b8 Add a bulk request method for bookmark icons.
Rather than dispatch a message for every url in the db, send a message to the
WebCoreThread to handle the query and iteration.  Update the documentation for
requestAllIcons.

Bug: 2581894
Change-Id: I8af4f87570465dff3839db4ac492883e8805b007
2010-04-12 14:26:13 -04:00
Andreas Huber
f0a49f68f0 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
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
10d4077240 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
b1e7bee2f3 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
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
Leon Scroggins
853a42409b 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.
2010-04-12 08:11:40 -07:00
Leon Scroggins
63284ede62 Do not check mWebTextView's focus state to determine editing mode.
Fix for bug 2568400.

Change-Id: I7e285388484bbab3aef9b6f4bb190e001266ce53
2010-04-12 10:55:39 -04:00
Wu-cheng Li
08caa704ae 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.
2010-04-10 11:42:15 -07:00
Scott Main
67d6590d24 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
2010-04-10 11:42:10 -07:00
Dianne Hackborn
06af762033 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
2010-04-10 11:42:05 -07:00
Robert Greenwalt
52ebff3c47 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.
2010-04-10 11:42:02 -07:00
Yu Shan Emily Lau
6e40664fc7 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.
2010-04-10 11:41:58 -07:00
Romain Guy
376722fcdf 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.
2010-04-10 11:41:54 -07:00
Wink Saville
19fe70cbe7 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
2010-04-10 11:41:50 -07:00
Wei Huang
997b38036f 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.
2010-04-10 11:41:45 -07:00
Jesse Wilson
f9e90378d5 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.
2010-04-10 11:41:38 -07:00
Mike Reed
58d50183bc 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
2010-04-10 11:41:30 -07:00
Robert Greenwalt
090af2c570 am 4dceedc1: Merge "Make ThrottleService notice policy changes." into froyo
Merge commit '4dceedc133ef0487577badb67100d20473d87762' into froyo-plus-aosp

* commit '4dceedc133ef0487577badb67100d20473d87762':
  Make ThrottleService notice policy changes.
2010-04-10 11:41:25 -07:00
Dan Egnor
505f22d1a4 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...)
2010-04-10 11:41:20 -07:00
Kristian Monsen
d25fb8db8d 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
2010-04-10 11:41:14 -07:00
Grace Kloba
210462e577 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
2010-04-10 11:41:09 -07:00
Kenny Root
f538b0ba7e Fix typos in name of density-independent pixels
Some places referred to "dip" as "device-independent pixels" but it
should be "density-independent pixels." Some publications are starting
to refer to this incorrectly.

Bug: 2586742
Change-Id: I030ef45a5ff61622c95133dcb7f2c82c7df652f0
2010-04-09 22:50:01 -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
Wu-cheng Li
c58b42327d Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF.
bug:2544367
Change-Id: If122a7745e080f9e4bffb15dc4930d71f0421867
2010-04-10 09:33:15 +08:00
Scott Main
2a547829fe Merge "cherry-pick from master: Icf079f5f45b1745a8d54f504e28dbbb52c6f7c96 docs: rewrite resources documentation" into froyo 2010-04-09 17:03:55 -07:00
Dianne Hackborn
17de1532a9 Merge "Fix issue #2581524: Car home icon should always go to car home" into froyo 2010-04-09 16:52:41 -07:00
Dianne Hackborn
f5c5d22c47 Fix issue #2581524: Car home icon should always go to car home
Rework how switching between modes work so the caller can tell us
whether they want to go to home.  (So car home launcher can now
tell us they always want to go home.)

Change-Id: Id4a8129027d6d162b4bae6f983911f1f4bf2578f
2010-04-09 16:49:08 -07:00
Robert Greenwalt
5cc072522b Merge "Add warning magic to be a bit more reasonable." into froyo 2010-04-09 16:47:10 -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
Romain Guy
4525c98114 Merge "Fix regression introduced when fixing focus issue with ScrollView. Bug #2581646" into froyo 2010-04-09 16:08:17 -07:00
Robert Greenwalt
e2c0ce0363 Add warning magic to be a bit more reasonable.
Currently warns if you exceed more than 25% and 2*100%*timeUsed/(timeUsed+totalTime)

The formula means that imagining you've got half of the remaining time that you really have,
we will warn you if you would exceed the quota given your rate so far.  It's generous during the
early to mid-life and converges back to the limit as your timeUsed approaches totalTime.

bug:2576057
Change-Id: Id189de5b026f927ef478fd212d61d9e4ab5239e6
2010-04-09 16:07:08 -07:00
Wink Saville
a18c824c02 Merge "Fix a FATAL ClassCastException in DataConnection.java" into froyo 2010-04-09 15:39:33 -07:00
Romain Guy
2d4cff64b4 Fix regression introduced when fixing focus issue with ScrollView.
Bug #2581646

The correct fix is to make ScrollView ignore the BACK key instead of consuming it.

Change-Id: I5c029a5c60ae8e7791391f63672c44b5c96fec71
2010-04-09 15:39:00 -07:00
Wei Huang
c621b65d2f Merge "bug #2542580: add the appropriate mdpi asset for chat icon." into froyo 2010-04-09 15:34:46 -07:00
Wei Huang
927a3c96d1 bug #2542580: add the appropriate mdpi asset for chat icon.
Change-Id: I474eb5b8fe83bbc7f92005de651444447c8624e7
2010-04-09 15:27:10 -07:00
Jesse Wilson
bc284a5f9f Merge "Move the public method HttpDateTime.parse() into AndroidHttpClient." into froyo 2010-04-09 14:01:07 -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
Jesse Wilson
7cfa90fee5 Move the public method HttpDateTime.parse() into AndroidHttpClient.
See bug http://b/2553589

Change-Id: Ide3399c7c63daf9c0b8c18669076f2f4d6e9a876
2010-04-09 13:34:15 -07:00