Mathias Agopian
9646b69388
am 5b669581: am 9d8e8dcc: Merge "fix [2757903] Crash in EGL when creating an EGLSurface" into kraken
2010-06-10 17:17:19 -07:00
Mathias Agopian
5b669581b3
am 9d8e8dcc: Merge "fix [2757903] Crash in EGL when creating an EGLSurface" into kraken
2010-06-10 17:15:12 -07:00
Mathias Agopian
9d8e8dcc84
Merge "fix [2757903] Crash in EGL when creating an EGLSurface" into kraken
2010-06-10 17:12:42 -07:00
Mathias Agopian
8b73ae4a1e
fix [2757903] Crash in EGL when creating an EGLSurface
...
Change-Id: I995947ac40d1a5c86dce495550baf6864ecf5f54
2010-06-10 17:06:27 -07:00
Dmitri Plotnikov
5661311825
Merge "Reimplement the PhoneNumberFormattingTextWatcher"
2010-06-10 16:52:53 -07:00
Romain Guy
0a87ae799c
Merge "Fix native crash when enabling hardware acceleration."
2010-06-10 16:19:51 -07:00
Romain Guy
c613328582
Fix native crash when enabling hardware acceleration.
...
This change also prevents hardware acceleration when the ViewRoot is in the
system process. This causes problem in EGL intialization because of having
both a SurfaceControl and a Surface. This is not needed and better to leave
it off anyway (so that preview windows don't get unnecessary hw acceleration.)
Change-Id: I1cc55d7fb9a4c1a9c4c59f11f49d3e44de78acef
2010-06-10 16:17:24 -07:00
Mike Lockwood
20ea8d0f85
am 799f0e50: am 4001120e: am f4a502a2: Merge "Don\'t adjust lights if screen or button brightness is changed when the screen is off." into froyo
2010-06-10 16:13:50 -07:00
Andreas Huber
2dabef2f4e
am 627a0019: am 4d61f602: Switch stagefright\'s approach to prefetching to the new model. The java MediaPlayer is now notified about rebuffering start/end via info messages.
2010-06-10 16:13:37 -07:00
Andreas Huber
45013ecaf9
am 32d8b25f: am a6ef19a8: Merge "Simplify the code in the stagefright commandline utility." into kraken
2010-06-10 16:13:29 -07:00
Andreas Huber
422c5a1408
am 566e64af: am fbdb5f1b: Merge "Switch LiveSource to use the new http data source instead of the old one." into kraken
2010-06-10 16:13:24 -07:00
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
Mike Lockwood
799f0e5076
am 4001120e: am f4a502a2: Merge "Don\'t adjust lights if screen or button brightness is changed when the screen is off." into froyo
2010-06-10 15:32:51 -07:00
Mike Lockwood
4001120e45
am f4a502a2: Merge "Don\'t adjust lights if screen or button brightness is changed when the screen is off." into froyo
...
Merge commit 'f4a502a235e9f9ea0bcd2d5ca4981dc6e1a619c4' into kraken
* commit 'f4a502a235e9f9ea0bcd2d5ca4981dc6e1a619c4':
Don't adjust lights if screen or button brightness is changed when the screen is off.
2010-06-10 15:30:41 -07:00
Mike Lockwood
f4a502a235
Merge "Don't adjust lights if screen or button brightness is changed when the screen is off." into froyo
2010-06-10 15:28:31 -07:00
Andreas Huber
627a001966
am 4d61f602: Switch stagefright\'s approach to prefetching to the new model. The java MediaPlayer is now notified about rebuffering start/end via info messages.
2010-06-10 15:19:29 -07:00
Andreas Huber
32d8b25fe6
am a6ef19a8: Merge "Simplify the code in the stagefright commandline utility." into kraken
2010-06-10 15:17:40 -07:00
Andreas Huber
566e64af84
am fbdb5f1b: Merge "Switch LiveSource to use the new http data source instead of the old one." into kraken
2010-06-10 15:17:35 -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
4d61f602bf
Switch stagefright's approach to prefetching to the new model. The java MediaPlayer is now notified about rebuffering start/end via info messages.
...
Change-Id: If8185ba329ce8b6663b1ad39a4efb0ad3be81df2
2010-06-10 15:16:57 -07:00
Andreas Huber
a6ef19a8f4
Merge "Simplify the code in the stagefright commandline utility." into kraken
2010-06-10 15:15:50 -07:00
Andreas Huber
fbdb5f1bb6
Merge "Switch LiveSource to use the new http data source instead of the old one." into kraken
2010-06-10 15:15:43 -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
c0668843d3
Simplify the code in the stagefright commandline utility.
...
Change-Id: Ia222b25ef12af34f6434421fd96b67eca800d1ab
2010-06-10 11:27:06 -07:00
Andreas Huber
82f8fd6a49
Switch LiveSource to use the new http data source instead of the old one.
...
Change-Id: I9623c480628c495dbfbe02bdc6372724a107e2e8
2010-06-10 11:26:24 -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