20974 Commits

Author SHA1 Message Date
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
Jesse Wilson
bc284a5f9f Merge "Move the public method HttpDateTime.parse() into AndroidHttpClient." into froyo 2010-04-09 14:01:07 -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
Mike Reed
a3c4c219c2 Merge "final versions of these fonts from ascender, including GPOS 'mark' feature" into froyo 2010-04-09 13:10:07 -07:00
Robert Greenwalt
4dceedc133 Merge "Make ThrottleService notice policy changes." into froyo 2010-04-09 13:00:05 -07:00
Dan Egnor
2d3df559de Merge "Fix sim build (sim doesn't have strl*() reliably...)" into froyo 2010-04-09 12:50:11 -07:00
Robert Greenwalt
81aa0971d7 Make ThrottleService notice policy changes.
Added ContentObserver to watch relevant Secure Settings.
Also added new policy-change broadcast to let settings know.
Lastly reorged things a bit so that all of our broadcasts are sent at boot so the sticky ones
are populated.

bug:2576057
Change-Id: Ie11ffb057de9c801a5088612cd464ea062f3a666
2010-04-09 12:42:45 -07:00
Mike Reed
bc60d52750 final versions of these fonts from ascender, including GPOS 'mark' feature
Change-Id: I3e9faa83b19ac344e12cbda6d33405f040a34a9e
http://b/issue?id=2585430
2010-04-09 15:12:19 -04:00
Kristian Monsen
34959e3fe8 Merge "Do not create intents for application/xhtml+xml" into froyo 2010-04-09 10:59:20 -07:00
Grace Kloba
e67e6b94fd 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
Kristian Monsen
e9a2fe013d Do not create intents for application/xhtml+xml
Fix for b 2584681, webview opens contents in browser.

Change-Id: I314e808a65f3c2043bd7bc7fcd44ac071f136bdc
2010-04-09 18:34:07 +01:00
Robert Greenwalt
a68780dd0f 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
cb27041034 Merge "Roaming data doesn't count against limits" into froyo 2010-04-09 09:29:21 -07:00
Eric Laurent
1921527c8d 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
Grace Kloba
9b6578071f 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.

Fix http://b/issue?id=2574172
2010-04-09 08:51:47 -07:00
Eric Laurent
9da7730d5f Merge "Additional fix for isssue 2548710: Native AudioTrack resources never freed." into froyo 2010-04-09 08:48:32 -07:00
Andreas Huber
91ce082696 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
4be2461f06 Merge "Support for ID3 V2.4 tags." into froyo 2010-04-09 07:01:58 -07:00
Patrick Scott
54c5330f23 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
380558bc5d 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
Patrick Scott
da9a22bc5c Save/restore the picture in a background thread.
Bug: 2573879
Change-Id: I0962f5286d3a68f8a9093f0c22917b0542ea9291
2010-04-09 08:10:38 -04:00
Dan Egnor
4e8d8238e1 Fix sim build (sim doesn't have strl*() reliably...)
Just stub out the TrafficStats code for the sim.
Bug: 2578938

Change-Id: Ie555f67f581d05ee446ea29cb2223feb350c52f9
2010-04-08 23:47:06 -07:00
Dan Egnor
f5d506d929 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
78158db510 Hail-Mary attempt to avoid apparent blocking problems in readEvents().
Use the same procedure (select() with a short timeout) used by "logcat -d",
which doesn't seem to have any blocking problems.

Bug: 2569403
Change-Id: Ia27bb4207919a1288716b41a007b4b4b52f8e90a
2010-04-08 22:59:43 -07:00
Dan Egnor
a2bf73435b 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
3895007d52 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
6c099149da 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
Robert Greenwalt
5f996899b0 Roaming data doesn't count against limits
bug:2576057
Change-Id: I51a66e3b49a62e0186816ec0473814a216184e6b
2010-04-08 19:12:38 -07:00
Dan Egnor
70c294b205 Merge "Fix OperationScheduler moratorium calculation for clock rollback case." into froyo 2010-04-08 17:38:28 -07:00
Dan Egnor
d64567450f 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
bbc6e33b1f Merge "Adds back the finalize method on the replaced Paint class." into froyo 2010-04-08 17:29:39 -07:00
Xavier Ducrohet
c56653bff1 Adds back the finalize method on the replaced Paint class.
without it com.android.layoutlib.bridge.TestClassReplacement fails.

Change-Id: Iafb6548f45c31e901591a45239224895c4403be8
2010-04-08 17:18:35 -07:00
Jeff Brown
37d2f5d15b Merge "Remove @link to hidden ACCESS_CACHE_FILESYSTEM permission." into froyo 2010-04-08 17:18:15 -07:00
Irfan Sheriff
750f32117b 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
Irfan Sheriff
c9b6851af6 Throttling framework addins
Add ThrottleManager in getSystemService
Add API for URL fetch

Bug: 2576057
Change-Id: Icd25c8b91ea4beea15c74e8ad7292ab48c962253
2010-04-08 16:53:32 -07:00
Jeff Brown
64010e8350 Remove @link to hidden ACCESS_CACHE_FILESYSTEM permission.
Change-Id: I4be691f20f650b412beb22b199a4cbef879b2668
2010-04-08 16:52:18 -07:00
Jeff Brown
b00771aa80 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
6742a0c9cc 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
267f0a6b68 Merge "Workaround NPE caused by packages missing signatures." into froyo 2010-04-08 16:41:47 -07:00
Jeff Brown
779a4ca84d Merge "Improve robustness of package manager certificate collection." into froyo 2010-04-08 16:41:37 -07:00
Brett Chabot
133d0b70ff 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
185f1a9668 Merge "IME test fixes." into froyo 2010-04-08 16:36:02 -07:00
Robert Greenwalt
6cf3d4aa76 am cc691f50: Merge "Updating some notificiation UI for Throttling" into froyo
Merge commit 'cc691f5061f4f5e687bf847078ee2ba387bdacb7' into froyo-plus-aosp

* commit 'cc691f5061f4f5e687bf847078ee2ba387bdacb7':
  Updating some notificiation UI for Throttling
2010-04-08 16:18:31 -07:00
Robert Greenwalt
cc691f5061 Merge "Updating some notificiation UI for Throttling" into froyo 2010-04-08 16:09:31 -07:00
Robert Greenwalt
c87dc6dc90 Updating some notificiation UI for Throttling
String update and make one an ongoing notification.

bug:2576057
Change-Id: I7980f110c7eed8e8bf305490eddaa58e2949e3be
2010-04-08 16:00:26 -07:00