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
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
Romain Guy
365088f681
Merge "Don't supply a null child to the click listener. External bug # http://code.google.com/p/android/issues/detail?id=7644 "
2010-04-09 14:09:42 -07:00
Romain Guy
c9c82b5669
Don't supply a null child to the click listener.
...
External bug #http://code.google.com/p/android/issues/detail?id=7644
Change-Id: Iea2c0d7fa02d355fd68750d6dccf8e6c6773ab6b
2010-04-09 14:08:26 -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
f70c9f2db2
am 49267612: am 061cd6e3: am a68780dd: am cb270410: Merge "Roaming data doesn\'t count against limits" into froyo
2010-04-09 09:44:14 -07: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
8e35fad15e
am 6bde88b9: am 2dc3da60: am 1921527c: am 9da7730d: Merge "Additional fix for isssue 2548710: Native AudioTrack resources never freed." into froyo
2010-04-09 09:06:51 -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
Andreas Huber
2228135452
am 0e9a439b: am b39c3aa7: am 91ce0826: am 4be2461f: Merge "Support for ID3 V2.4 tags." into froyo
2010-04-09 08:53:26 -07:00
Patrick Scott
cf43910740
am c3f5a620: am 8999c46c: am 54c5330f: am da9a22bc: Save/restore the picture in a background thread.
2010-04-09 08:53:22 -07:00
Dan Egnor
4f1803215d
am 1554ecce: am 5b4cc93b: am f5d506d9: am 78158db5: Hail-Mary attempt to avoid apparent blocking problems in readEvents().
2010-04-09 08:53:18 -07:00
Dan Egnor
172c1682c5
am f139940a: am d069fc9a: am a2bf7343: am 70c294b2: Merge "Fix OperationScheduler moratorium calculation for clock rollback case." into froyo
2010-04-09 08:53:14 -07:00
Xavier Ducrohet
ca29b43b93
am 3aa8710c: am f31e4abd: am 3895007d: am bbc6e33b: Merge "Adds back the finalize method on the replaced Paint class." into froyo
2010-04-09 08:53:09 -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
Jeff Brown
aa7d09d456
am 52a28b25: am 6883c176: am 6c099149: am 37d2f5d1: Merge "Remove @link to hidden ACCESS_CACHE_FILESYSTEM permission." into froyo
2010-04-09 08:53:03 -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
Mathias Agopian
270d49a246
am 88235a5e: am 672ea584: Merge "fix [2420565] Surface.lockCanvas() updates the dirty region too often" into kraken
2010-04-09 08:51:46 -07:00
Irfan Sheriff
d2220bd4cd
am eaec9f2e: am d99540d7: am 750f3211: am c9b6851a: Throttling framework addins
2010-04-09 08:51:19 -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