OSDN Git Service
Dave Sparks [Tue, 28 Sep 2010 15:44:39 +0000 (08:44 -0700)]
Merge "Fix media.player dumpsys to output open/mapped files correctly. Bug
2866669. The dump function whitelists several directories as filters to the output. The mount point changed for SD card in Froyo, and we started filtering files that were open on the SD card. This fix changes the filter for the SD card, and adds the directory for data files as well." into gingerbread
Jeff Brown [Tue, 28 Sep 2010 03:57:02 +0000 (20:57 -0700)]
Merge "Fix pointer index when splitting secondary pointers." into gingerbread
Jeff Brown [Mon, 27 Sep 2010 23:35:11 +0000 (16:35 -0700)]
Fix pointer index when splitting secondary pointers.
Change-Id: Ib01e810ea5b64501b1303000bbef0f0a1db2114e
Hung-ying Tyan [Tue, 28 Sep 2010 02:23:35 +0000 (19:23 -0700)]
Merge "Don't enter DISCONNECTING state when the call/connection is not alive" into gingerbread
Hung-ying Tyan [Mon, 27 Sep 2010 23:25:49 +0000 (16:25 -0700)]
Merge "Move SipService out of SystemServer to phone process." into gingerbread
Gilles Debunne [Mon, 27 Sep 2010 23:07:47 +0000 (16:07 -0700)]
Merge "Updated assets in status bar. DO NOT MERGE." into gingerbread
Nick Kralevich [Mon, 27 Sep 2010 22:23:45 +0000 (15:23 -0700)]
Merge "squeeze a few more bits of randomness into /dev/random" into gingerbread
Eric Fischer [Mon, 27 Sep 2010 22:01:33 +0000 (15:01 -0700)]
Merge "Trim unwanted whitespace from translations. DO NOT MERGE" into gingerbread
Gilles Debunne [Mon, 27 Sep 2010 21:26:56 +0000 (14:26 -0700)]
Merge "Revert previous status bar assets. DO NOT MERGE." into gingerbread
Wu-cheng Li [Mon, 27 Sep 2010 21:09:02 +0000 (14:09 -0700)]
Merge "The old overlay should be destroyed if orientation changes." into gingerbread
Kenny Root [Mon, 27 Sep 2010 19:45:44 +0000 (12:45 -0700)]
Merge "Use buffered I/O during certificate parsing" into gingerbread
Dianne Hackborn [Mon, 27 Sep 2010 19:42:34 +0000 (12:42 -0700)]
Merge "Allow all apps to call ContentResolver.getType()." into gingerbread
Jeff Brown [Mon, 27 Sep 2010 19:33:14 +0000 (12:33 -0700)]
Merge "Add suuport for splitting touch events across windows." into gingerbread
Joe Onorato [Mon, 27 Sep 2010 18:41:24 +0000 (11:41 -0700)]
Merge "We only need at most one tty icon." into gingerbread
Joe Onorato [Mon, 27 Sep 2010 18:40:15 +0000 (11:40 -0700)]
Merge "If an icon add remove get coalesced, don't remove some other icon." into gingerbread
Hung-ying Tyan [Mon, 27 Sep 2010 17:54:27 +0000 (10:54 -0700)]
Merge "SipAudioCall: remove SipManager dependency." into gingerbread
Dan Morrill [Mon, 27 Sep 2010 17:30:41 +0000 (10:30 -0700)]
Merge "Adding a feature to indicate that the device possesses low-latency audio. The specific criteria for low-latency audio are defined in the CDD, but since that hasn't yet been settled for Gingerbread, this change doesn't go into details. We can do a docs change later once GB CDD is final." into gingerbread
James Dong [Mon, 27 Sep 2010 17:08:52 +0000 (10:08 -0700)]
Merge "Fix track duration calculation if the start timestamp is non-zero" into gingerbread
Andreas Huber [Mon, 27 Sep 2010 16:20:58 +0000 (09:20 -0700)]
Merge "Support other kinds of HTTP redirect in NuHTTPDataSource" into gingerbread
Eric Laurent [Mon, 27 Sep 2010 15:41:00 +0000 (08:41 -0700)]
Merge "Fix error in AudioEffect command status reporting." into gingerbread
Kenny Root [Mon, 27 Sep 2010 15:03:47 +0000 (08:03 -0700)]
Merge "Use buffered output during packages.xml write" into gingerbread
Fabrice Di Meglio [Mon, 27 Sep 2010 09:16:01 +0000 (02:16 -0700)]
Merge "Fix bug #
2585298 (google calendar sync clears eventTimezone field for recurring allDay events)" into gingerbread
Jeff Brown [Mon, 27 Sep 2010 05:20:12 +0000 (22:20 -0700)]
Add suuport for splitting touch events across windows.
This feature is currently used to enable dragging the start and end
selection handles of a TextView at the same time. Could be used for
other things later.
Deleted some dead code in ArrowKeyMovementMethod and CursorControllers.
Change-Id: I930accd97ca1ca1917aab8a807db2c950fc7b409
Mindy Pereira [Mon, 27 Sep 2010 01:16:26 +0000 (18:16 -0700)]
Merge "DO NOT MERGE. Only 1 edge glow should be growing at a time." into gingerbread
Jean-Baptiste Queru [Mon, 27 Sep 2010 00:29:28 +0000 (17:29 -0700)]
reconcile froyo-release into gingerbread
Change-Id: I4c6d47421ed7a26b65f4f2df105d8375fcc3d840
John Wang [Sun, 26 Sep 2010 20:53:33 +0000 (13:53 -0700)]
Merge "Add debug functions." into gingerbread
Mathias Agopian [Sat, 25 Sep 2010 01:02:10 +0000 (18:02 -0700)]
Merge changes I1f7c4535,I741c68a2 into gingerbread
* changes:
simple test app for screen capture API
add support for [
1974164] Be able to take a screen shot on the device
Patrick Dubroy [Fri, 24 Sep 2010 23:57:46 +0000 (16:57 -0700)]
Merge "do not merge - Asset update (pass #3)" into gingerbread
Dianne Hackborn [Fri, 24 Sep 2010 22:28:34 +0000 (15:28 -0700)]
Merge "Some debugging support." into gingerbread
Mathias Agopian [Fri, 24 Sep 2010 22:01:49 +0000 (15:01 -0700)]
simple test app for screen capture API
Change-Id: I1f7c453508ccfd4faaa8b1279968a358ce3f1e5a
Mathias Agopian [Fri, 24 Sep 2010 18:26:58 +0000 (11:26 -0700)]
add support for [
1974164] Be able to take a screen shot on the device
screenshots are taken using ISurfaceComposer::captureScreen() which returns
the size of the screenshot and an IMemoryHeap containing the data.
screenshots have limitations:
- they will always fail if a secure window is up on screen
- require GL_OES_framebuffer_object extension
- in some situation, video planes won't been captured
Change-Id: I741c68a2d2984fb139039301c3349e6780e2cd58
Eric Laurent [Fri, 24 Sep 2010 20:43:54 +0000 (13:43 -0700)]
Merge "fix problem in AudioEffect JNI setup." into gingerbread
Dianne Hackborn [Fri, 24 Sep 2010 18:16:23 +0000 (11:16 -0700)]
Some debugging support.
- New feature to "am monitor" to have it automatically launch
gdbserv for you when a crash/ANR happens, and tell you how to
run the client.
- Update dumpstate to match new location of binder debug logs
- Various commented out logs that are being used to track down
issues.
Change-Id: Ia5dd0cd2df983a1fc6be697642a4590aa02a26a5
Nick Kralevich [Fri, 24 Sep 2010 20:10:42 +0000 (13:10 -0700)]
Merge "Use the default SecureRandom provider." into gingerbread
Patrick Scott [Fri, 24 Sep 2010 18:34:10 +0000 (11:34 -0700)]
Merge "Add new Alarm provider class for setting an alarm." into gingerbread
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