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
Daisuke Miyakawa
4ac671ad97
Add comments for vCard parser.
...
Bug: 2576594
Change-Id: I3303a350bdea7b1b84bd1fb318d31ba5a229457d
2010-04-09 14:53:24 +09: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
Mathias Agopian
88235a5e9b
am 672ea584: Merge "fix [2420565] Surface.lockCanvas() updates the dirty region too often" into kraken
2010-04-08 22:38:29 -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
Mathias Agopian
672ea584f5
Merge "fix [2420565] Surface.lockCanvas() updates the dirty region too often" into kraken
2010-04-08 19:10:52 -07:00
Mathias Agopian
db3647ff4f
fix [2420565] Surface.lockCanvas() updates the dirty region too often
...
There was a bug where we were we could be reallocating buffers for no reason.
Change-Id: Ieb8a81a289da9339ab7faf987cd3a73428943c1a
2010-04-08 19:09:04 -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
eaec9f2e67
am d99540d7: am 750f3211: am c9b6851a: Throttling framework addins
2010-04-08 17:10:36 -07:00
Irfan Sheriff
d99540d7a2
am 750f3211: am c9b6851a: Throttling framework addins
...
Merge commit '750f32117b96a8af4fb03fae459a80f79a667fca' into kraken
* commit '750f32117b96a8af4fb03fae459a80f79a667fca':
Throttling framework addins
2010-04-08 17:05:06 -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
Jeff Brown
182a2f380f
am 5a8a507c: am b059dc9c: am b00771aa: am 267f0a6b: Merge "Workaround NPE caused by packages missing signatures." into froyo
2010-04-08 16:54:41 -07:00
Jeff Brown
5fff8b2e1a
am 51fb09d9: am cebd1e94: am 6742a0c9: am 779a4ca8: Merge "Improve robustness of package manager certificate collection." into froyo
2010-04-08 16:54:37 -07:00
Brett Chabot
31c19917c1
am 19912d2f: am 3622d253: am 133d0b70: am 185f1a96: Merge "IME test fixes." into froyo
2010-04-08 16:54:32 -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
5a8a507c5a
am b059dc9c: am b00771aa: am 267f0a6b: Merge "Workaround NPE caused by packages missing signatures." into froyo
2010-04-08 16:49:56 -07:00
Jeff Brown
51fb09d948
am cebd1e94: am 6742a0c9: am 779a4ca8: Merge "Improve robustness of package manager certificate collection." into froyo
2010-04-08 16:49:52 -07:00
Brett Chabot
19912d2f3b
am 3622d253: am 133d0b70: am 185f1a96: Merge "IME test fixes." into froyo
2010-04-08 16:49:46 -07:00
Jeff Brown
b059dc9c89
am b00771aa: am 267f0a6b: Merge "Workaround NPE caused by packages missing signatures." into froyo
...
Merge commit 'b00771aa806e9fd43669f09e8c348f2b4457ca0b' into kraken
* commit 'b00771aa806e9fd43669f09e8c348f2b4457ca0b':
Workaround NPE caused by packages missing signatures.
2010-04-08 16:47:19 -07:00
Jeff Brown
cebd1e9468
am 6742a0c9: am 779a4ca8: Merge "Improve robustness of package manager certificate collection." into froyo
...
Merge commit '6742a0c9ccb8ade97d9cdfd53f7c74a9dc04c3a0' into kraken
* commit '6742a0c9ccb8ade97d9cdfd53f7c74a9dc04c3a0':
Improve robustness of package manager certificate collection.
2010-04-08 16:47:15 -07:00
Brett Chabot
3622d25347
am 133d0b70: am 185f1a96: Merge "IME test fixes." into froyo
...
Merge commit '133d0b70ff569dad9d996be49fdea10c2bdd4b97' into kraken
* commit '133d0b70ff569dad9d996be49fdea10c2bdd4b97':
IME test fixes.
2010-04-08 16:45:16 -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