OSDN Git Service
Kenny Root [Fri, 24 Sep 2010 18:33:35 +0000 (11:33 -0700)]
Merge "Revert "Revert "Free created FileMap when uncompressing files""" into gingerbread
Kenny Root [Fri, 24 Sep 2010 18:33:29 +0000 (11:33 -0700)]
Merge "Add locking around ZIP seeking" into gingerbread
Andreas Huber [Fri, 24 Sep 2010 17:44:01 +0000 (10:44 -0700)]
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
Robert Greenwalt [Fri, 24 Sep 2010 17:42:46 +0000 (10:42 -0700)]
Merge "Move long Connectivity tasks to handler thread." into gingerbread
Eric Fischer [Fri, 24 Sep 2010 17:37:04 +0000 (10:37 -0700)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Eric Laurent [Fri, 24 Sep 2010 16:43:24 +0000 (09:43 -0700)]
Merge "Fix issue
3007862" into gingerbread
Kenny Root [Fri, 24 Sep 2010 16:11:28 +0000 (09:11 -0700)]
Revert "Revert "Free created FileMap when uncompressing files""
This revert reverts commit
a19ef306bd0a257c67b50f5e0e669e9fe52b0889.
Andreas Huber [Fri, 24 Sep 2010 15:17:20 +0000 (08:17 -0700)]
Merge "Proper sync-frame detection for sources that don't already provide it." into gingerbread
Kenny Root [Fri, 24 Sep 2010 14:57:37 +0000 (07:57 -0700)]
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
satok [Fri, 24 Sep 2010 08:33:23 +0000 (01:33 -0700)]
Merge "Use MOTOYA font for Japanese font" into gingerbread
Mathias Agopian [Fri, 24 Sep 2010 01:14:44 +0000 (18:14 -0700)]
Merge "better fix for [
3028370] GL get error should return a valid error if no context is bound." into gingerbread
Joe Onorato [Thu, 23 Sep 2010 23:52:28 +0000 (16:52 -0700)]
Merge "Crash apps when they provide bad notifications instead of crashing the system process." into gingerbread
Mathias Agopian [Thu, 23 Sep 2010 23:38:38 +0000 (16:38 -0700)]
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
Chung-yih Wang [Thu, 23 Sep 2010 23:36:18 +0000 (16:36 -0700)]
Merge "Handle OPTIONS requests from SIP servers." into gingerbread
Dirk Dougherty [Thu, 23 Sep 2010 21:58:41 +0000 (14:58 -0700)]
Merge "Doc change: ADT 0.9.9 version notes, size/sum update." into gingerbread
Jeff Brown [Thu, 23 Sep 2010 21:51:52 +0000 (14:51 -0700)]
Merge "Enforce serial ordering of MotionEvents." into gingerbread
Kenny Root [Thu, 23 Sep 2010 21:27:00 +0000 (14:27 -0700)]
Merge "Better errors in PackageManagerTests" into gingerbread
Andreas Huber [Thu, 23 Sep 2010 21:16:48 +0000 (14:16 -0700)]
Merge "Depending on our preference to write 2-byte or 4-byte NALs, patch the codec specific data 'avcC' accordingly." into gingerbread
Dianne Hackborn [Thu, 23 Sep 2010 21:15:45 +0000 (14:15 -0700)]
Merge "Fix a deadlock I ran into." into gingerbread
Eric Fischer [Thu, 23 Sep 2010 20:47:06 +0000 (13:47 -0700)]
Merge "Add an aapt option to allow string variations for different devices." into gingerbread
Mathias Agopian [Thu, 23 Sep 2010 18:32:52 +0000 (11:32 -0700)]
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
Scott Main [Thu, 23 Sep 2010 18:41:48 +0000 (11:41 -0700)]
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
Dirk Dougherty [Thu, 23 Sep 2010 18:37:33 +0000 (11:37 -0700)]
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.
Scott Main [Thu, 23 Sep 2010 18:23:48 +0000 (11:23 -0700)]
Merge "docs: add more info about state list drawable and onclick attribute to Button bug:
1062898" into froyo
Eric Laurent [Thu, 23 Sep 2010 18:07:06 +0000 (11:07 -0700)]
Merge "Fix issue
3022800." into gingerbread
Amith Yamasani [Thu, 23 Sep 2010 18:03:49 +0000 (11:03 -0700)]
Merge "Fix for IndexOutOfBounds in setComposingRegion." into gingerbread
James Dong [Thu, 23 Sep 2010 17:11:04 +0000 (10:11 -0700)]
Merge "Use the advertised profile and level from M4V and H263 video encoders" into gingerbread
Robert Greenwalt [Thu, 23 Sep 2010 15:41:21 +0000 (08:41 -0700)]
Merge "Cleanup Netd to prevent getting hung." into gingerbread
repo sync [Thu, 23 Sep 2010 06:14:15 +0000 (23:14 -0700)]
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.
Adam Powell [Thu, 23 Sep 2010 04:08:10 +0000 (21:08 -0700)]
Merge "DO NOT MERGE Apply new styles to the status bar/notification shade" into gingerbread
Amith Yamasani [Wed, 22 Sep 2010 23:29:49 +0000 (16:29 -0700)]
Merge "Fix NPE in PowerManagerService on boot, if some settings are corrupted." into gingerbread
Eric Laurent [Wed, 22 Sep 2010 23:00:59 +0000 (16:00 -0700)]
Merge "Request permission for global audio effects." into gingerbread
Steve Howard [Wed, 22 Sep 2010 22:57:12 +0000 (15:57 -0700)]
Merge "Decrease sensitivity of orientation changes a bit." into gingerbread
Eric Laurent [Wed, 22 Sep 2010 22:53:49 +0000 (15:53 -0700)]
Merge "Fix more audio effects auto tests" into gingerbread
Andreas Huber [Wed, 22 Sep 2010 22:34:00 +0000 (15:34 -0700)]
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
Brad Fitzpatrick [Wed, 22 Sep 2010 22:25:26 +0000 (15:25 -0700)]
Merge "Flesh out StrictMode docs." into gingerbread
Mathias Agopian [Wed, 22 Sep 2010 21:15:23 +0000 (14:15 -0700)]
Merge "fix small bug in EGL error management" into gingerbread
Andreas Huber [Wed, 22 Sep 2010 19:20:54 +0000 (12:20 -0700)]
Merge "Make sure we drain the avc software decoder's output queue once we run out of input data." into gingerbread
Vasu Nori [Wed, 22 Sep 2010 19:10:37 +0000 (12:10 -0700)]
Merge "DO NOT MERGE - redo Ib5e519fb40d3191ecac06c03a844872df19f3963" into gingerbread
Jesse Wilson [Wed, 22 Sep 2010 18:38:43 +0000 (11:38 -0700)]
Merge "Fix problem where Base64InputStream single-byte reads were unsigned." into gingerbread
Mike Lockwood [Wed, 22 Sep 2010 16:54:53 +0000 (09:54 -0700)]
Merge "GpsLocationProvider: Fix race condition while bringing up APN for SUPL." into gingerbread
Hung-ying Tyan [Wed, 22 Sep 2010 16:35:35 +0000 (09:35 -0700)]
Merge "SipService: fix thread/socket leak" into gingerbread
Eric Laurent [Wed, 22 Sep 2010 16:34:00 +0000 (09:34 -0700)]
Merge "Fix broken insert reverb auto tests." into gingerbread
Cary Clark [Wed, 22 Sep 2010 15:29:12 +0000 (08:29 -0700)]
Merge "Do not merge: clear text selection on rotate" into gingerbread
Jeff Brown [Wed, 22 Sep 2010 01:33:12 +0000 (18:33 -0700)]
Merge "Fix race reading input configuration during system startup." into gingerbread
Dan Morrill [Tue, 21 Sep 2010 23:59:29 +0000 (16:59 -0700)]
Merge "Adding new feature definitions for new sensors (barometer and gyroscope.)" into gingerbread
Eric Laurent [Tue, 21 Sep 2010 22:55:17 +0000 (15:55 -0700)]
Merge "Fix issue
2913071." into gingerbread
Mathias Agopian [Tue, 21 Sep 2010 22:43:59 +0000 (15:43 -0700)]
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
Jeff Brown [Tue, 21 Sep 2010 22:36:06 +0000 (15:36 -0700)]
Merge "Looper: use pthread_once for TLS key initialization." into gingerbread
Jeff Brown [Tue, 21 Sep 2010 22:11:18 +0000 (15:11 -0700)]
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
Andreas Huber [Tue, 21 Sep 2010 22:17:04 +0000 (15:17 -0700)]
Merge "This log message is codec specific." into gingerbread
Andreas Huber [Tue, 21 Sep 2010 22:14:43 +0000 (15:14 -0700)]
Merge "Remove stagefright foundation's incompatible logging interface and update callsites." into gingerbread
Kenny Root [Tue, 21 Sep 2010 22:00:30 +0000 (15:00 -0700)]
Merge "Add image creator helper script for OBBs" into gingerbread
Steve Howard [Tue, 21 Sep 2010 21:58:05 +0000 (14:58 -0700)]
Merge "Un-@hide ability to download without a running notification." into gingerbread
Adam Powell [Tue, 21 Sep 2010 21:04:13 +0000 (14:04 -0700)]
Merge "Add mdpi text select anchor asset" into gingerbread
Mindy Pereira [Tue, 21 Sep 2010 21:04:00 +0000 (14:04 -0700)]
Merge "DO NOT MERGE Tweaked EdgeGlow to better match user expectations." into gingerbread
Chet Haase [Tue, 21 Sep 2010 20:42:56 +0000 (13:42 -0700)]
Merge "do not merge" into gingerbread
Steve Howard [Tue, 21 Sep 2010 19:49:36 +0000 (12:49 -0700)]
Merge "Support for download manager "queue for wifi" dialogs" into gingerbread
Vasu Nori [Tue, 21 Sep 2010 19:22:10 +0000 (12:22 -0700)]
Merge "DO NOT MERGE - use appropriate names on SQL numbers in 'adb bugreport'" into gingerbread
Cary Clark [Tue, 21 Sep 2010 18:47:38 +0000 (11:47 -0700)]
Merge "Do not merge : cancel text select mode when pressing back, etc." into gingerbread
James Dong [Tue, 21 Sep 2010 18:34:26 +0000 (11:34 -0700)]
Merge "Allow record to set input color format as a command line option" into gingerbread
Doug Zongker [Tue, 21 Sep 2010 18:32:01 +0000 (11:32 -0700)]
Merge "recovery just takes a filename as an argument now (do not merge)" into gingerbread
Neal Nguyen [Tue, 21 Sep 2010 18:02:29 +0000 (11:02 -0700)]
Merge "Adding more DL Manager tests." into gingerbread
Eric Laurent [Tue, 21 Sep 2010 17:47:17 +0000 (10:47 -0700)]
Merge "Made audio effect control panel intents public." into gingerbread
Jesse Wilson [Tue, 21 Sep 2010 17:30:39 +0000 (10:30 -0700)]
Merge "Fix double-checked locking bug in LocalSocket." into gingerbread
James Dong [Tue, 21 Sep 2010 17:19:22 +0000 (10:19 -0700)]
Merge "Another attempt for fixing AAC+/eAAC+ related issue" into gingerbread
Mike Lockwood [Tue, 21 Sep 2010 15:45:34 +0000 (08:45 -0700)]
Merge "SystemUI: Use new USB notifications to detect USB disconnect." into gingerbread
Robert Greenwalt [Tue, 21 Sep 2010 15:06:15 +0000 (08:06 -0700)]
Merge "Inet status bug fix" into gingerbread
Dianne Hackborn [Tue, 21 Sep 2010 07:24:23 +0000 (00:24 -0700)]
Merge "Fix issue #
2999757: "Application Redirected" dialogue showing up erratically" into gingerbread
Dianne Hackborn [Tue, 21 Sep 2010 05:19:47 +0000 (22:19 -0700)]
Merge "Fix #
2999258: ANR in Settings after every reboot" into gingerbread
Chung-yih Wang [Tue, 21 Sep 2010 05:04:57 +0000 (22:04 -0700)]
Merge "Revert the ANSWERING state." into gingerbread
Robert Greenwalt [Tue, 21 Sep 2010 04:29:02 +0000 (21:29 -0700)]
Merge "Add Inet Condition log to bugreports" into gingerbread
Irfan Sheriff [Tue, 21 Sep 2010 02:51:39 +0000 (19:51 -0700)]
Merge "DO NOT MERGE Enable debug in StatusBarService" into gingerbread
Mike Lockwood [Tue, 21 Sep 2010 00:16:03 +0000 (17:16 -0700)]
Merge "LocationManager: Hide location provider and geocode provider APIs." into gingerbread
Dianne Hackborn [Tue, 21 Sep 2010 00:03:15 +0000 (17:03 -0700)]
Merge "DO NOT MERGE. Wifi service now blames apps for its wake lock use." into gingerbread
Dianne Hackborn [Mon, 20 Sep 2010 23:54:22 +0000 (16:54 -0700)]
Merge "In theory the package manager now scans /vendor/app" into gingerbread
Scott Main [Mon, 20 Sep 2010 23:37:32 +0000 (16:37 -0700)]
am
73e150c8: provide link to backup guide above the fold
Merge commit '
73e150c886afc6cd92e8b065a58d61e0b2a098ed' into gingerbread
* commit '
73e150c886afc6cd92e8b065a58d61e0b2a098ed':
provide link to backup guide above the fold
Dianne Hackborn [Mon, 20 Sep 2010 23:29:42 +0000 (16:29 -0700)]
Merge "Some battery improvements:" into gingerbread
Steve Howard [Mon, 20 Sep 2010 22:40:41 +0000 (15:40 -0700)]
Merge "New error status for "destination file already exists"." into gingerbread
John Wang [Mon, 20 Sep 2010 22:35:02 +0000 (15:35 -0700)]
Merge "Use PhoneBase in the phone list." into gingerbread
Brian Swetland [Mon, 20 Sep 2010 21:05:25 +0000 (14:05 -0700)]
Merge "support loading EGL libraries from /vendor/lib/egl as well as /system/lib/egl" into gingerbread
Brian Swetland [Mon, 20 Sep 2010 19:58:15 +0000 (12:58 -0700)]
support loading EGL libraries from /vendor/lib/egl as well as /system/lib/egl
Change-Id: Idd9ca85ce3ba6c92234375071b53e5365e689062
Hung-ying Tyan [Mon, 20 Sep 2010 01:02:13 +0000 (18:02 -0700)]
Merge "SIP: add config flag for wifi-only configuration." into gingerbread
Adam Powell [Sat, 18 Sep 2010 02:15:38 +0000 (19:15 -0700)]
Merge "Fix some drawing artifacts/bugs around overlays/text anchors" into gingerbread
Jeff Brown [Sat, 18 Sep 2010 00:26:02 +0000 (17:26 -0700)]
Merge "Reduce lock thrashing in native Looper." into gingerbread
Jeff Brown [Sat, 18 Sep 2010 00:01:23 +0000 (17:01 -0700)]
Reduce lock thrashing in native Looper.
In the common case, there is nothing interesting happening on the native
Looper besides occasional wake ups. There is no point grabbing the
semaphore then.
Change-Id: Ib5c426d0e158dfa37891b7ff5537b6f833592fad
Adam Powell [Fri, 17 Sep 2010 22:41:11 +0000 (15:41 -0700)]
Merge "Fix silly touch bug in TextView. Oops." into gingerbread
Marco Nelissen [Fri, 17 Sep 2010 22:39:00 +0000 (15:39 -0700)]
Merge "Add a check to track a problem the monkey script has been triggering." into gingerbread
John Wang [Fri, 17 Sep 2010 22:03:01 +0000 (15:03 -0700)]
Merge "Add debug function." into gingerbread
Jeff Brown [Fri, 17 Sep 2010 20:25:55 +0000 (13:25 -0700)]
Merge "Looper: Drop default parameters in favor of a safer overload." into gingerbread
Chet Haase [Fri, 17 Sep 2010 20:10:54 +0000 (13:10 -0700)]
Merge "new assets" into gingerbread
Tadashi G. Takaoka [Fri, 17 Sep 2010 07:01:19 +0000 (00:01 -0700)]
Merge "Initialize Keyboard.Key attributes from parent Keyboard.Row" into gingerbread
Brian Carlstrom [Fri, 17 Sep 2010 06:48:53 +0000 (23:48 -0700)]
Merge "Fix sim-eng build on Hardy" into gingerbread
Hung-ying Tyan [Fri, 17 Sep 2010 06:30:49 +0000 (23:30 -0700)]
Merge "Add timer to SIP session creation process." into gingerbread
Mathias Agopian [Fri, 17 Sep 2010 04:41:13 +0000 (21:41 -0700)]
Fix typo which causes sensors to fail miserably
Change-Id: Ieca18fc089e2bdf7d049f213836971b54d11cd76
Jeff Brown [Fri, 17 Sep 2010 01:28:12 +0000 (18:28 -0700)]
Looper: Drop default parameters in favor of a safer overload.
The idea is that if you're writing code that wants fd/events/data on
return from pollOnce() / pollAll() you should really pass in all of those
arguments. When I changed the Looper API earlier, it was difficult
to ensure that all callers were passing the right parameters since they
were relying on default parameters to some degree so usage mistakes
would not have been caught by the compiler.
Change-Id: I1f2812894270aaf1515017ac1616b6b312d9b565
Mathias Agopian [Fri, 17 Sep 2010 00:55:05 +0000 (17:55 -0700)]
Merge "surfaceflinger / GL extensions cleanup" into gingerbread
Mathias Agopian [Fri, 17 Sep 2010 00:54:50 +0000 (17:54 -0700)]
Merge "part of fix for [
3004226] Cannot end the call - Proximity sensor doesn't work" into gingerbread
Mathias Agopian [Fri, 17 Sep 2010 00:54:42 +0000 (17:54 -0700)]
Merge "fix [
2931909] SensorManger breaks when using different SensorEventListener w/ the same sensors" into gingerbread
Jesse Wilson [Fri, 17 Sep 2010 00:52:29 +0000 (17:52 -0700)]
Merge "Add optional tags to frameworks/base ext." into gingerbread