Andreas Huber
669bdbf6d1
am b9d7b46b: am 8f864513: Merge "Fix String8 to free its memory only after assignment operations based on pointers are finished in case that pointer referred to the string\'s original contents." into kraken
2010-06-10 16:13:18 -07:00
Andreas Huber
6ee780de7f
am 960a0ff1: am c81d2c12: Merge "Initial check-in of new caching/prefetching data source implementation." into kraken
2010-06-10 16:13:11 -07:00
Brad Fitzpatrick
b60c941811
resolved conflicts for merge of f37cbe6b to master
...
Change-Id: I529b17e55b9668f900f685f92e9831e14a82db05
2010-06-10 15:58:22 -07:00
Andreas Huber
b9d7b46ba3
am 8f864513: Merge "Fix String8 to free its memory only after assignment operations based on pointers are finished in case that pointer referred to the string\'s original contents." into kraken
2010-06-10 15:17:30 -07:00
Andreas Huber
960a0ff1f4
am c81d2c12: Merge "Initial check-in of new caching/prefetching data source implementation." into kraken
2010-06-10 15:17:24 -07:00
Andreas Huber
8f86451314
Merge "Fix String8 to free its memory only after assignment operations based on pointers are finished in case that pointer referred to the string's original contents." into kraken
2010-06-10 15:15:37 -07:00
Andreas Huber
c81d2c12de
Merge "Initial check-in of new caching/prefetching data source implementation." into kraken
2010-06-10 15:15:29 -07:00
Brad Fitzpatrick
f37cbe6bb6
am 438d0595: Introduce "StrictMode"
2010-06-10 15:03:26 -07:00
Brad Fitzpatrick
438d059512
Introduce "StrictMode"
...
This is a new public API for developers to opt-in to strict rules
about what they're allowed to do on certain threads. (this is the
public face of the @hide dalvik.system.BlockGuard, added recently...)
In practice this will be used for developers to opt-in to declaring
that they don't want to be allowed to do various operations (such as
disk I/O or network operations) on their main UI threads. (these
operations are often accidental, or even when they are fast come with
a good chance of being slow or very slow in some cases....)
Implementation wise, this is just a thread-local integer that has a
bitmask of the things that aren't allowed, and more bits for saying
what the violation penalty is. The penalties, of which multiple can
be chosen, include:
* logging
* dropbox uploading for analysis/reporting
* annoying dialog
* full-on crashing
These are all only very roughly implemented at this point, but all
parts now minimally work end-to-end now, so this is a good checkpoint
commit before this gets too large.
Future CLs will polish all the above 4 penalties, including
checksumming of stacktraces and minimizing penalties for duplicate
violations.
Change-Id: Icbe61a2e950119519e7364030b10c3c28d243abe
2010-06-10 14:38:58 -07:00
Kenny Root
92a4d078e5
Merge "Move shaping to native."
2010-06-10 14:25:39 -07:00
Mike Lockwood
aefed3626e
Merge changes I99b3452f,Idda56860
...
* changes:
CameraBrowser: Display thumbnails for camera images.
MTP: Add support for retrieving thumbnails to MTP content provider.
2010-06-10 14:21:53 -07:00
Adam Powell
a876b851fa
am 45c3f843: am 8f1bfb00: am 8f2ca788: Merge "Fix bug 2757693 - Multi-touch coordinates can jump when a finger goes down." into froyo
2010-06-10 14:19:26 -07:00
Adam Powell
45c3f843d6
am 8f1bfb00: am 8f2ca788: Merge "Fix bug 2757693 - Multi-touch coordinates can jump when a finger goes down." into froyo
2010-06-10 14:16:32 -07:00
Adam Powell
8f1bfb001b
am 8f2ca788: Merge "Fix bug 2757693 - Multi-touch coordinates can jump when a finger goes down." into froyo
...
Merge commit '8f2ca788f369892370477212cf9e7a67721a8c16' into kraken
* commit '8f2ca788f369892370477212cf9e7a67721a8c16':
Fix bug 2757693 - Multi-touch coordinates can jump when a finger goes down.
2010-06-10 14:13:51 -07:00
Adam Powell
8f2ca788f3
Merge "Fix bug 2757693 - Multi-touch coordinates can jump when a finger goes down." into froyo
2010-06-10 14:09:50 -07:00
Doug Felt
0c702b88c5
Move shaping to native.
...
Add internal API (getTextRunAdvances) to Paint, use when measuring.
Add internal API (getTextRunCursor) to Paint, use when determining
valid cursor positions.
Remove java-level shaping code. Remove 'prep' code in TextLine
(except for replacement text) since shaping now is done on the fly as
needed in native.
Provide explicit shaping context bounds to internal text measuring,
cursor movement, and rendering APIs.
Update for to changes in external API in ushape.h.
Change-Id: I146958b624802ce8553125e5c3c6c03031bc9608
2010-06-10 14:03:22 -07:00
Mike Lockwood
99b3452f40
CameraBrowser: Display thumbnails for camera images.
...
Signed-off-by: Mike Lockwood <lockwood@android.com >
2010-06-10 16:58:05 -04:00
Mike Lockwood
dda5686092
MTP: Add support for retrieving thumbnails to MTP content provider.
...
Signed-off-by: Mike Lockwood <lockwood@android.com >
2010-06-10 16:58:03 -04:00
Andreas Huber
a9aaf8ffce
am c90e35c1: am 8d300280: Merge "Support "pausing" of MediaSources with the effect that they no longer pull on their upstream source until a subsequent read-with-seek." into kraken
2010-06-10 12:43:53 -07:00
Andreas Huber
815758ba7d
am 3ee447e4: am 75c1c8e3: Merge "Initial check in of a new http data source implementation." into kraken
2010-06-10 12:43:48 -07:00
Andreas Huber
c90e35c1fc
am 8d300280: Merge "Support "pausing" of MediaSources with the effect that they no longer pull on their upstream source until a subsequent read-with-seek." into kraken
2010-06-10 12:42:10 -07:00
Andreas Huber
3ee447e4f7
am 75c1c8e3: Merge "Initial check in of a new http data source implementation." into kraken
2010-06-10 12:42:06 -07:00
Andreas Huber
8d30028065
Merge "Support "pausing" of MediaSources with the effect that they no longer pull on their upstream source until a subsequent read-with-seek." into kraken
2010-06-10 12:41:05 -07:00
Andreas Huber
75c1c8e3f5
Merge "Initial check in of a new http data source implementation." into kraken
2010-06-10 12:40:39 -07:00
Nick Kralevich
97af83bca1
am fc66fa53: (-s ours) am 9a9724c3: am a2c6d5bf: (-s ours) do not merge: cherry-picked 929b4855b8 from master branch
2010-06-10 11:58:59 -07:00
Nick Kralevich
fc66fa5376
am 9a9724c3: am a2c6d5bf: (-s ours) do not merge: cherry-picked 929b4855b8 from master branch
2010-06-10 11:57:05 -07:00
Nick Kralevich
9a9724c3be
am a2c6d5bf: (-s ours) do not merge: cherry-picked 929b4855b8 from master branch
...
Merge commit 'a2c6d5bf308181c019ade0aac6d25fe33dc3d76c' into kraken
* commit 'a2c6d5bf308181c019ade0aac6d25fe33dc3d76c':
do not merge: cherry-picked 929b4855b8 from master branch
2010-06-10 11:54:53 -07:00
Andreas Huber
62a2aa0152
Fix String8 to free its memory only after assignment operations based on pointers are finished in case that pointer referred to the string's original contents.
...
Change-Id: I6961f3cf10ba3b728579ea63262db750a4cf8577
2010-06-10 11:25:51 -07:00
Andreas Huber
1f24b30fe4
Support "pausing" of MediaSources with the effect that they no longer pull on their upstream source until a subsequent read-with-seek.
...
Change-Id: Ie4153a10ab36c1135f5fcfb572958129d886bcc3
2010-06-10 11:24:49 -07:00
Andreas Huber
b206319122
Initial check-in of new caching/prefetching data source implementation.
...
Change-Id: I97a6e3f03c69c9b1219f1f06bd109c0102f2c504
2010-06-10 11:23:56 -07:00
Andreas Huber
163c493b50
Initial check in of a new http data source implementation.
...
Change-Id: I17c358288ffe9ef690d702c58723c766d0a0cf21
2010-06-10 11:22:56 -07:00
Mike Lockwood
0809c0e4c6
CameraBrowser: New test app for the MTP content provider.
...
Change-Id: I8423d728b13ed8ac87bd2792eefddce3287598bb
Signed-off-by: Mike Lockwood <lockwood@android.com >
2010-06-10 14:08:35 -04:00
Mike Lockwood
f724eed566
MTP provider: Add columns for MTP ObjectInfo dataset to the MTP objects table
...
Signed-off-by: Mike Lockwood <lockwood@android.com >
Change-Id: Ife0563ad1c3b3dbc2461e1a9e784cbb4653b3435
2010-06-10 14:08:29 -04:00
Irfan Sheriff
1ac53c3087
Merge "Make NetworkStateTracker an interface"
2010-06-10 11:05:25 -07:00
Irfan Sheriff
d649c12815
Make NetworkStateTracker an interface
...
As part of the WifiStateTracker cleanup, need
to have NetworkStateTracker as an interface.
Change-Id: I2ac48d7e4c7274ac4df40bc3b8591b182956a936
2010-06-10 10:55:23 -07:00
Nick Kralevich
a2c6d5bf30
do not merge: cherry-picked 929b4855b8 from master branch
...
Change-Id: Ie20371234a531f65f523682a0d0c27394dc30afa
2010-06-10 10:39:42 -07:00
James Dong
f3e969a3bb
am 3aede37f: am 3a0b37a0: Merge "Remove the lock/unlock workaround from CameraService" into kraken
2010-06-10 10:18:52 -07:00
Andreas Huber
c8105742ff
am 7b909c05: am 66b89a62: Merge "Apparently the TI video decoder only supports H.264 up to baseline profile/level 3, not level 3.x as previously assumed." into kraken
2010-06-10 10:17:04 -07:00
James Dong
3aede37f19
am 3a0b37a0: Merge "Remove the lock/unlock workaround from CameraService" into kraken
2010-06-10 10:16:55 -07:00
Andreas Huber
7b909c0553
am 66b89a62: Merge "Apparently the TI video decoder only supports H.264 up to baseline profile/level 3, not level 3.x as previously assumed." into kraken
2010-06-10 10:14:50 -07:00
James Dong
3a0b37a04e
Merge "Remove the lock/unlock workaround from CameraService" into kraken
2010-06-10 10:14:38 -07:00
Andreas Huber
66b89a62aa
Merge "Apparently the TI video decoder only supports H.264 up to baseline profile/level 3, not level 3.x as previously assumed." into kraken
2010-06-10 10:12:57 -07:00
Andreas Huber
e2f85077a2
Apparently the TI video decoder only supports H.264 up to baseline profile/level 3, not level 3.x as previously assumed.
...
Change-Id: I4a9aa80f392dbef72f81e25c67e5bd0654848b2c
2010-06-10 09:52:11 -07:00
Kenny Root
051e19458d
am c46f03e4: am 36921ad8: am b00854d4: Import revised translations
2010-06-09 22:35:55 -07:00
Kenny Root
c46f03e4a9
am 36921ad8: am b00854d4: Import revised translations
2010-06-09 22:33:47 -07:00
Kenny Root
36921ad858
am b00854d4: Import revised translations
...
Merge commit 'b00854d4c07ee8c810d1e32984543297bfa80a8e' into kraken
* commit 'b00854d4c07ee8c810d1e32984543297bfa80a8e':
Import revised translations
2010-06-09 22:31:32 -07:00
Kenny Root
b00854d4c0
Import revised translations
...
Change-Id: I25faf1ade5252fa29cf43aa13e99fef9fc31b418
2010-06-09 22:25:58 -07:00
James Dong
71d714ccbf
Remove the lock/unlock workaround from CameraService
...
bug - 2677772
Change-Id: I7c996daad8b3bfc89e9fa2d655dc18c9a5c68f2f
2010-06-09 21:30:43 -07:00
Dmitri Plotnikov
81d5dad156
Merge "Adding a stopLoading() method."
2010-06-09 20:22:03 -07:00
Dmitri Plotnikov
d92ea071c0
Adding a stopLoading() method.
...
This add an API to stop and remove a loader that
is no longer needed.
Change-Id: Ibe59981bb8bc9965a3360917e80b0e710efcd8e1
2010-06-09 20:20:38 -07:00