Kenny Root
aea0ae5ad4
Merge "Revert "Revert "Free created FileMap when uncompressing files""" into gingerbread
2010-09-24 11:33:35 -07:00
Kenny Root
7f3a7afc92
Merge "Add locking around ZIP seeking" into gingerbread
2010-09-24 11:33:29 -07:00
Andreas Huber
d3eaa15246
Merge "Instead of just writing one track to the .mp4 file, write all of them (at most 1 video and 1 audio track). Also support httplive URIs in the stagefright commandline tool." into gingerbread
2010-09-24 10:44:01 -07:00
Robert Greenwalt
ea871eb0b1
Merge "Move long Connectivity tasks to handler thread." into gingerbread
2010-09-24 10:42:46 -07:00
Eric Fischer
421f2d2566
Merge "Import revised translations. DO NOT MERGE" into gingerbread
2010-09-24 10:37:04 -07:00
Eric Laurent
b21a6713b9
Merge "Fix issue 3007862" into gingerbread
2010-09-24 09:43:24 -07:00
Kenny Root
b47eafac1d
Revert "Revert "Free created FileMap when uncompressing files""
...
This revert reverts commit a19ef306bd0a257c67b50f5e0e669e9fe52b0889.
2010-09-24 09:11:28 -07:00
Andreas Huber
864ec8e074
Merge "Proper sync-frame detection for sources that don't already provide it." into gingerbread
2010-09-24 08:17:20 -07:00
Kenny Root
fa98920b71
Add locking around ZIP seeking
...
Since we switched to seeking to the LFH to verify its existence instead
of a huge mmap of the file, we have to guarantee that another seek
doesn't happen before we finish our read on the LFH.
Change-Id: If8135d9cb6f2f5cc4db734eafa4f6b5f6269c62a
2010-09-24 08:05:51 -07:00
satok
ffe49bf1a1
Merge "Use MOTOYA font for Japanese font" into gingerbread
2010-09-24 01:33:23 -07:00
Mathias Agopian
3bbafb57c3
Merge "better fix for [3028370] GL get error should return a valid error if no context is bound." into gingerbread
2010-09-23 18:14:44 -07:00
Joe Onorato
3144c628ce
Merge "Crash apps when they provide bad notifications instead of crashing the system process." into gingerbread
2010-09-23 16:52:28 -07:00
Mathias Agopian
6f0871222f
better fix for [3028370] GL get error should return a valid error if no context is bound.
...
it turns out that we cannot return INVALID_OPERATION from glGetError() because the
GL spec says that it must be called in a loop until it returns GL_NO_ERROR.
now, we always return 0 from GL functions called from a thread with no
context bound. This means that glGetError() will return NO_ERROR in this case,
which is better than returning a random value (which could trap the app in a loop).
if this happens in the main thread of a process, we LOG an error message once.
Change-Id: Id59620e675a890286ef62a257c02b06e0fdcaf69
2010-09-23 16:44:48 -07:00
Chung-yih Wang
d03ee8731e
Merge "Handle OPTIONS requests from SIP servers." into gingerbread
2010-09-23 16:36:18 -07:00
Dirk Dougherty
f12e928701
Merge "Doc change: ADT 0.9.9 version notes, size/sum update." into gingerbread
2010-09-23 14:58:41 -07:00
Jeff Brown
3b8eb3ffb7
Merge "Enforce serial ordering of MotionEvents." into gingerbread
2010-09-23 14:51:52 -07:00
Kenny Root
8aa24c202f
Merge "Better errors in PackageManagerTests" into gingerbread
2010-09-23 14:27:00 -07:00
Andreas Huber
c2f6c6a149
Merge "Depending on our preference to write 2-byte or 4-byte NALs, patch the codec specific data 'avcC' accordingly." into gingerbread
2010-09-23 14:16:48 -07:00
Dianne Hackborn
63dfdc39ca
Merge "Fix a deadlock I ran into." into gingerbread
2010-09-23 14:15:45 -07:00
Eric Fischer
a939afe212
Merge "Add an aapt option to allow string variations for different devices." into gingerbread
2010-09-23 13:47:06 -07:00
Mathias Agopian
05c53113e0
fix [3028370] GL get error should return a valid error if no context is bound.
...
glGetError() will now always return GL_INVALID_OPERATION if called from a thread
with no GL context bound.
Change-Id: I28ba458871db051bb4f5a26668a1fa123526869c
2010-09-23 13:19:02 -07:00
Scott Main
53c155baf8
am 5b7328f2: Merge "docs: add more info about state list drawable and onclick attribute to Button bug:1062898" into froyo
...
Merge commit '5b7328f257a76ff6b7b60872d6a106002ff1f679' into gingerbread
* commit '5b7328f257a76ff6b7b60872d6a106002ff1f679':
docs: add more info about state list drawable and onclick attribute to Button
2010-09-23 11:41:48 -07:00
Dirk Dougherty
76a56bd84b
am 27de3a24: (-s ours) Doc change: ADT 0.9.9 version notes, size/sum update.
...
Merge commit '27de3a240fcf6e5cdd1b228fa11ffcb4fdc73866' into gingerbread
* commit '27de3a240fcf6e5cdd1b228fa11ffcb4fdc73866':
Doc change: ADT 0.9.9 version notes, size/sum update.
2010-09-23 11:37:33 -07:00
Scott Main
fcaaa5a74a
Merge "docs: add more info about state list drawable and onclick attribute to Button bug:1062898" into froyo
2010-09-23 11:23:48 -07:00
Eric Laurent
a9167bde9d
Merge "Fix issue 3022800." into gingerbread
2010-09-23 11:07:06 -07:00
Amith Yamasani
2d2f44ca3d
Merge "Fix for IndexOutOfBounds in setComposingRegion." into gingerbread
2010-09-23 11:03:49 -07:00
James Dong
b3cc6a47f2
Merge "Use the advertised profile and level from M4V and H263 video encoders" into gingerbread
2010-09-23 10:11:04 -07:00
Robert Greenwalt
63d0074b5a
Merge "Cleanup Netd to prevent getting hung." into gingerbread
2010-09-23 08:41:21 -07:00
repo sync
938db5b127
Merge changes I7efff4f2,I1631ee20,I14d9886a,Ic2858920,Iff588130,I37ba9d83 into gingerbread
...
* changes:
SIP: Make SipAudioCallImpl use SimpleSessionDescription instead of javax.sdp.
SDP: Add a simple class to help manipulate session descriptions.
RTP: Add log throttle for "no data".
RTP: Update native part to reflect the API change.
RTP: Add two getters to retrieve the current configuration from AudioStream.
RTP: Extend codec capability and update the APIs.
2010-09-22 23:14:15 -07:00
Adam Powell
4a220ba58d
Merge "DO NOT MERGE Apply new styles to the status bar/notification shade" into gingerbread
2010-09-22 21:08:10 -07:00
Amith Yamasani
44db6e1fa4
Merge "Fix NPE in PowerManagerService on boot, if some settings are corrupted." into gingerbread
2010-09-22 16:29:49 -07:00
Eric Laurent
7a31199704
Merge "Request permission for global audio effects." into gingerbread
2010-09-22 16:00:59 -07:00
Steve Howard
e05595c170
Merge "Decrease sensitivity of orientation changes a bit." into gingerbread
2010-09-22 15:57:12 -07:00
Eric Laurent
3f9dab6a7d
Merge "Fix more audio effects auto tests" into gingerbread
2010-09-22 15:53:49 -07:00
Andreas Huber
250522c661
Merge "Raise the amount of memory set aside for omx buffer allocations in the test harness to accomodate the new requirements of some codecs." into gingerbread
2010-09-22 15:34:00 -07:00
Brad Fitzpatrick
060b5f6757
Merge "Flesh out StrictMode docs." into gingerbread
2010-09-22 15:25:26 -07:00
Mathias Agopian
1c3654864d
Merge "fix small bug in EGL error management" into gingerbread
2010-09-22 14:15:23 -07:00
Andreas Huber
4a198dc08f
Merge "Make sure we drain the avc software decoder's output queue once we run out of input data." into gingerbread
2010-09-22 12:20:54 -07:00
Vasu Nori
d9c52a7c96
Merge "DO NOT MERGE - redo Ib5e519fb40d3191ecac06c03a844872df19f3963" into gingerbread
2010-09-22 12:10:37 -07:00
Jesse Wilson
edc1238264
Merge "Fix problem where Base64InputStream single-byte reads were unsigned." into gingerbread
2010-09-22 11:38:43 -07:00
Mike Lockwood
ab7a8ac2cf
Merge "GpsLocationProvider: Fix race condition while bringing up APN for SUPL." into gingerbread
2010-09-22 09:54:53 -07:00
Hung-ying Tyan
a5a1eb7cb8
Merge "SipService: fix thread/socket leak" into gingerbread
2010-09-22 09:35:35 -07:00
Eric Laurent
be9efe04c7
Merge "Fix broken insert reverb auto tests." into gingerbread
2010-09-22 09:34:00 -07:00
Cary Clark
f945f81265
Merge "Do not merge: clear text selection on rotate" into gingerbread
2010-09-22 08:29:12 -07:00
Jeff Brown
452598cc1e
Merge "Fix race reading input configuration during system startup." into gingerbread
2010-09-21 18:33:12 -07:00
Dan Morrill
01d038ae02
Merge "Adding new feature definitions for new sensors (barometer and gyroscope.)" into gingerbread
2010-09-21 16:59:29 -07:00
Eric Laurent
f5d7bad76a
Merge "Fix issue 2913071." into gingerbread
2010-09-21 15:55:17 -07:00
Mathias Agopian
02dafb5068
fix small bug in EGL error management
...
make sure to clear our EGL implementation's error when returning
an error from an underlying implementation
Change-Id: Ibce4726cef1f900e4c7f16002345d7a07f8cdf41
2010-09-21 15:43:59 -07:00
Jeff Brown
02a5e339d0
Merge "Looper: use pthread_once for TLS key initialization." into gingerbread
2010-09-21 15:36:06 -07:00
Jeff Brown
61a25b2490
Looper: use pthread_once for TLS key initialization.
...
Also fix a Valgrind complaint by zeroing out the entire epoll event
struct since otherwise the data field union would be partly
uninitialized (but not in a harmful way).
Change-Id: I2091ce517e87fcad7c9caf90e2c5e4854a7ca465
2010-09-21 15:26:51 -07:00