Mathias Agopian
cf2bd28510
Merge "small cleanup. gEGLImpl should have been static" into kraken
2010-04-09 14:28:03 -07:00
Mathias Agopian
e547835c52
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
2010-04-09 14:26:07 -07:00
Andreas Huber
f4e5baa1e9
I accidentally broken passion encoding while working around problems with the sholes encoder.
...
Change-Id: Id91b837ed17083cb21efb08e1c1ab9cc3ff3fa8f
2010-04-09 14:25:46 -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
Andreas Huber
e2018ca9ff
Remove unnecessary lock from AMRWriter.
...
Change-Id: Ia02966d936dd8cbb31e92051578a3fa816885710
2010-04-09 13:49:39 -07:00
Andreas Huber
71c27d991a
Various fixes to enable recording on passion and nexus1.
...
Change-Id: I75a461c9882e2449082ad754ee7b231c1ceec039
2010-04-09 13:47:58 -07:00
Andreas Huber
ab88ea9503
Remove legacy NO_OPENCORE code bypass from MediaPlayerService.
...
Change-Id: I72db73c91673e0d7f1090e3b033ae915337dc16e
2010-04-09 13:44:28 -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
4926761258
am 061cd6e3: am a68780dd: am cb270410: Merge "Roaming data doesn\'t count against limits" into froyo
2010-04-09 09:39:59 -07:00
Robert Greenwalt
061cd6e322
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
2010-04-09 09:35:55 -07: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
6bde88b9a9
am 2dc3da60: am 1921527c: am 9da7730d: Merge "Additional fix for isssue 2548710: Native AudioTrack resources never freed." into froyo
2010-04-09 09:03:30 -07:00
Eric Laurent
2dc3da60c4
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.
2010-04-09 08:58:30 -07:00
Wink Saville
662262ac04
Fix a FATAL ClassCastException in DataConnection.java
...
bug: 2583290
Change-Id: I93e0307664427b29942b1ed1e5acbf21e78a605f
2010-04-09 08:57:31 -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
0e9a439b0d
am b39c3aa7: am 91ce0826: am 4be2461f: Merge "Support for ID3 V2.4 tags." into froyo
2010-04-09 07:15:09 -07:00
Andreas Huber
b39c3aa753
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.
2010-04-09 07:09:49 -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
c3f5a6201f
am 8999c46c: am 54c5330f: am da9a22bc: Save/restore the picture in a background thread.
2010-04-09 06:47:56 -07:00
Patrick Scott
8999c46c77
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.
2010-04-09 06:43:47 -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
1554ecce32
am 5b4cc93b: am f5d506d9: am 78158db5: Hail-Mary attempt to avoid apparent blocking problems in readEvents().
2010-04-08 23:12:43 -07:00
Dan Egnor
5b4cc93b0d
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().
2010-04-08 23:08:56 -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
f139940a91
am d069fc9a: am a2bf7343: am 70c294b2: Merge "Fix OperationScheduler moratorium calculation for clock rollback case." into froyo
2010-04-08 22:54:34 -07:00
Xavier Ducrohet
3aa8710c4f
am f31e4abd: am 3895007d: am bbc6e33b: Merge "Adds back the finalize method on the replaced Paint class." into froyo
2010-04-08 22:54:29 -07:00
Jeff Brown
52a28b2534
am 6883c176: am 6c099149: am 37d2f5d1: Merge "Remove @link to hidden ACCESS_CACHE_FILESYSTEM permission." into froyo
2010-04-08 22:54:25 -07:00
Dan Egnor
d069fc9ad7
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.
2010-04-08 22:50:50 -07:00
Xavier Ducrohet
f31e4abd5e
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.
2010-04-08 22:50:46 -07:00
Jeff Brown
6883c1769f
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.
2010-04-08 22:50:42 -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