Commit Graph

13978 Commits

Author SHA1 Message Date
Scott Main
d60b0ca1f5 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
0d63616f22 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
768b5d31c0 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
913ae44953 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
0bcb08c19f 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
d579d794a7 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
d52d0b0550 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
7e97d87b02 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
edc5c788be 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
3420a62f0a 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
e9675befc9 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
1716a441a4 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
ab9d21919b 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
Scott Main
7765c25dfa Merge "cherry-pick from master: Icf079f5f45b1745a8d54f504e28dbbb52c6f7c96 docs: rewrite resources documentation" into froyo 2010-04-09 17:03:55 -07:00
Dianne Hackborn
45888b7200 Merge "Fix issue #2581524: Car home icon should always go to car home" into froyo 2010-04-09 16:52:41 -07:00
Robert Greenwalt
533ebe2173 Merge "Add warning magic to be a bit more reasonable." into froyo 2010-04-09 16:47:10 -07:00
Yu Shan Emily Lau
22cbafc589 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
3d436720d2 Merge "Fix regression introduced when fixing focus issue with ScrollView. Bug #2581646" into froyo 2010-04-09 16:08:17 -07:00
Wink Saville
1a34d6c86d Merge "Fix a FATAL ClassCastException in DataConnection.java" into froyo 2010-04-09 15:39:33 -07:00
Wei Huang
c3af71c8fd Merge "bug #2542580: add the appropriate mdpi asset for chat icon." into froyo 2010-04-09 15:34:46 -07:00
Jesse Wilson
533d354621 Merge "Move the public method HttpDateTime.parse() into AndroidHttpClient." into froyo 2010-04-09 14:01:07 -07:00
Jesse Wilson
fd472ba92c Move the public method HttpDateTime.parse() into AndroidHttpClient.
See bug http://b/2553589

Change-Id: Ide3399c7c63daf9c0b8c18669076f2f4d6e9a876
2010-04-09 13:34:15 -07:00
Mike Reed
75716915d0 Merge "final versions of these fonts from ascender, including GPOS 'mark' feature" into froyo 2010-04-09 13:10:07 -07:00
Robert Greenwalt
9169ebd2d3 Merge "Make ThrottleService notice policy changes." into froyo 2010-04-09 13:00:05 -07:00
Dan Egnor
291444fdb6 Merge "Fix sim build (sim doesn't have strl*() reliably...)" into froyo 2010-04-09 12:50:11 -07:00
Kristian Monsen
276ed8df4f Merge "Do not create intents for application/xhtml+xml" into froyo 2010-04-09 10:59:20 -07:00
Grace Kloba
51053fda45 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 2010-04-09 10:49:42 -07:00
Robert Greenwalt
aa428ad6ef 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
2010-04-09 09:32:03 -07:00
Robert Greenwalt
e304ba1219 Merge "Roaming data doesn't count against limits" into froyo 2010-04-09 09:29:21 -07:00
Eric Laurent
56caad8f06 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.
2010-04-09 08:53:08 -07:00
Eric Laurent
376f728b35 Merge "Additional fix for isssue 2548710: Native AudioTrack resources never freed." into froyo 2010-04-09 08:48:32 -07:00
Andreas Huber
df649dcf20 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.
2010-04-09 07:06:11 -07:00
Andreas Huber
248281006b Merge "Support for ID3 V2.4 tags." into froyo 2010-04-09 07:01:58 -07:00
Patrick Scott
433ec61862 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.
2010-04-09 06:37:11 -07:00
Eric Laurent
775fa3cd32 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
2010-04-09 06:11:48 -07:00
Dan Egnor
cffaf6881e 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().
2010-04-08 23:04:16 -07:00
Dan Egnor
4672704eaa 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.
2010-04-08 22:39:27 -07:00
Xavier Ducrohet
be819eed47 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.
2010-04-08 22:39:24 -07:00
Jeff Brown
16c8a3671d 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.
2010-04-08 22:39:19 -07:00
Dan Egnor
35c1a2dc1f Merge "Fix OperationScheduler moratorium calculation for clock rollback case." into froyo 2010-04-08 17:38:28 -07:00
Dan Egnor
66424a44c5 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
2010-04-08 17:30:37 -07:00
Xavier Ducrohet
a540ed0064 Merge "Adds back the finalize method on the replaced Paint class." into froyo 2010-04-08 17:29:39 -07:00
Jeff Brown
7710cd4c35 Merge "Remove @link to hidden ACCESS_CACHE_FILESYSTEM permission." into froyo 2010-04-08 17:18:15 -07:00
Irfan Sheriff
aeae766c4c am c9b6851a: Throttling framework addins
Merge commit 'c9b6851af68bdc20c4903b16c344e9f116647219' into froyo-plus-aosp

* commit 'c9b6851af68bdc20c4903b16c344e9f116647219':
  Throttling framework addins
2010-04-08 17:01:59 -07:00
Jeff Brown
5733ad453d am 267f0a6b: Merge "Workaround NPE caused by packages missing signatures." into froyo
Merge commit '267f0a6b683a2de75450afee59d2058b292c72c8' into froyo-plus-aosp

* commit '267f0a6b683a2de75450afee59d2058b292c72c8':
  Workaround NPE caused by packages missing signatures.
2010-04-08 16:44:40 -07:00
Jeff Brown
68e2f85740 am 779a4ca8: Merge "Improve robustness of package manager certificate collection." into froyo
Merge commit '779a4ca84d62a6e4f18a723cfc18c5d035f60fed' into froyo-plus-aosp

* commit '779a4ca84d62a6e4f18a723cfc18c5d035f60fed':
  Improve robustness of package manager certificate collection.
2010-04-08 16:44:37 -07:00
Jeff Brown
62737b55d2 Merge "Workaround NPE caused by packages missing signatures." into froyo 2010-04-08 16:41:47 -07:00
Jeff Brown
20460cfc7d Merge "Improve robustness of package manager certificate collection." into froyo 2010-04-08 16:41:37 -07:00
Brett Chabot
5313fd997b am 185f1a96: Merge "IME test fixes." into froyo
Merge commit '185f1a96683f59e2ff617b688449fd490e364be7' into froyo-plus-aosp

* commit '185f1a96683f59e2ff617b688449fd490e364be7':
  IME test fixes.
2010-04-08 16:39:50 -07:00
Brett Chabot
399d2f06da Merge "IME test fixes." into froyo 2010-04-08 16:36:02 -07:00