OSDN Git Service
Andreas Huber [Thu, 7 Oct 2010 18:59:53 +0000 (11:59 -0700)]
Merge "Work to support switching transport streams mid-stream and signalling discontinuities to the decoder." into gingerbread
Justin Ho [Thu, 7 Oct 2010 18:56:18 +0000 (11:56 -0700)]
Merge "Fixed popup assets (background)" into gingerbread
Adam Powell [Thu, 7 Oct 2010 18:32:49 +0000 (11:32 -0700)]
Merge "Fix bug
3071869 - text anchors are now treated as application sub-panels." into gingerbread
Brad Fitzpatrick [Thu, 7 Oct 2010 18:27:56 +0000 (11:27 -0700)]
Merge "Quiet unnecessary debug logging." into gingerbread
Andreas Huber [Thu, 7 Oct 2010 17:57:32 +0000 (10:57 -0700)]
Merge "On this particular device the hardware video decoder spits out buffers that don't actually contain our video data, so we cannot use them to restore the video frame after suspend/resume." into gingerbread
Kenny Root [Thu, 7 Oct 2010 17:54:14 +0000 (10:54 -0700)]
Merge "Eliminate MCS_GIVE_UP state" into gingerbread
Gilles Debunne [Thu, 7 Oct 2010 17:52:11 +0000 (10:52 -0700)]
Merge "Removed unused and broken screen_progress" into gingerbread
Brad Fitzpatrick [Thu, 7 Oct 2010 17:20:32 +0000 (10:20 -0700)]
Merge "DropBox.Entry javadoc syntax fix" into gingerbread
John Wang [Thu, 7 Oct 2010 16:47:01 +0000 (09:47 -0700)]
Merge "Add flag to skip restoring network seletion." into gingerbread
Eric Rowe [Thu, 7 Oct 2010 16:06:30 +0000 (09:06 -0700)]
Merge "DO NOT MERGE Initialize bluetooth profiles in BT stress tests" into gingerbread
Wink Saville [Thu, 7 Oct 2010 15:34:01 +0000 (08:34 -0700)]
Merge "Changed handling of onQueryCompelete to not use mimeType." into gingerbread
Wu-cheng Li [Thu, 7 Oct 2010 12:49:27 +0000 (05:49 -0700)]
Merge "Add javadoc for display orientation." into gingerbread
Hung-ying Tyan [Thu, 7 Oct 2010 06:11:09 +0000 (23:11 -0700)]
Merge "Make SipService broadcast SIP_SERVICE_UP when it's up." into gingerbread
Eric Fischer [Thu, 7 Oct 2010 00:32:17 +0000 (17:32 -0700)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Xavier Ducrohet [Thu, 7 Oct 2010 00:32:10 +0000 (17:32 -0700)]
Merge "Parser is optional in obtainStyledAttributes." into gingerbread
Hung-ying Tyan [Thu, 7 Oct 2010 00:29:28 +0000 (17:29 -0700)]
Merge "SIP: Fix busy authentication loop." into gingerbread
Dianne Hackborn [Thu, 7 Oct 2010 00:26:16 +0000 (17:26 -0700)]
Merge "Make Activity.removeDialog() less strict." into gingerbread
Kenny Root [Wed, 6 Oct 2010 23:59:23 +0000 (16:59 -0700)]
Merge "Add MountService tests and fix a bug it found" into gingerbread
Dianne Hackborn [Wed, 6 Oct 2010 23:56:02 +0000 (16:56 -0700)]
Merge "Work on issue #
3062691: GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider" into gingerbread
Dianne Hackborn [Wed, 6 Oct 2010 18:19:51 +0000 (11:19 -0700)]
Merge "Make USB mass storage hide keyguard when shown." into gingerbread
Chung-yih Wang [Wed, 6 Oct 2010 08:50:25 +0000 (01:50 -0700)]
Merge "Misc fixes for sim-eng build." into gingerbread
Fred Chung [Wed, 6 Oct 2010 06:39:23 +0000 (23:39 -0700)]
am
30264c9b: Merge "Doc change: Adding new docs for Device Admin API." into froyo
Merge commit '
30264c9b85109ae58c1e472a747bf47464cc1632' into gingerbread
* commit '
30264c9b85109ae58c1e472a747bf47464cc1632':
Doc change: Adding new docs for Device Admin API.
Fred Chung [Wed, 6 Oct 2010 06:26:41 +0000 (23:26 -0700)]
Merge "Doc change: Adding new docs for Device Admin API." into froyo
Dianne Hackborn [Wed, 6 Oct 2010 02:02:52 +0000 (19:02 -0700)]
Merge "Fix NPE if there is no accelerometer." into gingerbread
Dianne Hackborn [Wed, 6 Oct 2010 01:56:54 +0000 (18:56 -0700)]
Merge "Fix issue #
3001368: API REVIEW: android.app.Activity" into gingerbread
Hung-ying Tyan [Wed, 6 Oct 2010 01:33:22 +0000 (18:33 -0700)]
Merge "CallManager/SipPhone: fix reject a ringing call" into gingerbread
Gilles Debunne [Wed, 6 Oct 2010 01:11:09 +0000 (18:11 -0700)]
Merge "Fix for IndexOutOfBounds in text pasting." into gingerbread
Eric Laurent [Wed, 6 Oct 2010 00:06:16 +0000 (17:06 -0700)]
Merge "Fixed AudioFlinger not always pausing tracks" into gingerbread
Adam Powell [Tue, 5 Oct 2010 23:39:24 +0000 (16:39 -0700)]
Merge "DO NOT MERGE Fix bug
3001751 and bug
3001584 - Gingerbread API review for over-scroll" into gingerbread
Dianne Hackborn [Tue, 5 Oct 2010 21:42:04 +0000 (14:42 -0700)]
Merge "Fix issue #
3056500: Problem report for ASTRO" into gingerbread
Joe Onorato [Tue, 5 Oct 2010 21:41:16 +0000 (14:41 -0700)]
Merge "PowerManagerService needs yet another flag..." into gingerbread
Andreas Huber [Tue, 5 Oct 2010 21:09:32 +0000 (14:09 -0700)]
Merge "Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after submitting all samples to AudioTrack to make sure those remaining samples are actually played out." into gingerbread
Kenny Root [Tue, 5 Oct 2010 21:04:26 +0000 (14:04 -0700)]
Merge "Remove lingering system app native libs in /data" into gingerbread
Jeff Brown [Tue, 5 Oct 2010 20:06:05 +0000 (13:06 -0700)]
Merge "Make secure views tolerate IME overlays." into gingerbread
Kenny Root [Tue, 5 Oct 2010 19:48:46 +0000 (12:48 -0700)]
Merge "Get correct native library path on reinstall" into gingerbread
Dianne Hackborn [Tue, 5 Oct 2010 19:48:40 +0000 (12:48 -0700)]
Merge "DO NOT MERGE: Get rid of status bar's dim during night." into gingerbread
Mike Lockwood [Tue, 5 Oct 2010 19:36:34 +0000 (12:36 -0700)]
Merge changes Ic5551c94,I0207f7f7 into gingerbread
* changes:
GPS: Clean up GPS API extension initialization in JNI code.
GPS: Add support for AGpsRilInterface.
Jeff Brown [Tue, 5 Oct 2010 19:26:23 +0000 (12:26 -0700)]
Make secure views tolerate IME overlays.
Change-Id: I3cf09b9d91045f4d9c558b4aace482a7b0bbd3d8
Robert Greenwalt [Tue, 5 Oct 2010 18:46:12 +0000 (11:46 -0700)]
Merge "Add supporting MCC=450(Korea)" into gingerbread
Brett Chabot [Tue, 5 Oct 2010 18:00:07 +0000 (11:00 -0700)]
Merge "Failing test cleanup." into gingerbread
Hung-ying Tyan [Tue, 5 Oct 2010 06:03:26 +0000 (23:03 -0700)]
Merge "SIP: add SERVER_UNREACHABLE error code." into gingerbread
Hung-ying Tyan [Tue, 5 Oct 2010 06:02:55 +0000 (23:02 -0700)]
Merge "SipService: supply PendingIntent when open a profile." into gingerbread
Dianne Hackborn [Tue, 5 Oct 2010 06:00:25 +0000 (23:00 -0700)]
Merge "Make it easier to figure out whether an app can go on sd card." into gingerbread
Neal Nguyen [Tue, 5 Oct 2010 04:07:37 +0000 (21:07 -0700)]
Merge "Fixing some flakiness of some DL Manager tests." into gingerbread
Mathias Agopian [Tue, 5 Oct 2010 03:17:25 +0000 (20:17 -0700)]
Merge "fix [
2835280] Add support for cancelling buffers to ANativeWindow" into gingerbread
Mathias Agopian [Fri, 1 Oct 2010 23:22:41 +0000 (16:22 -0700)]
fix [
2835280] Add support for cancelling buffers to ANativeWindow
There is a new ANativeWindow::cancelBuffer() API that can be used to
cancel any dequeued buffer, BEFORE it's been enqueued. The buffer is
returned to the list of availlable buffers. dequeue and cancel are not
mutually thread safe, they must be called from the same thread or
external synchronization must be used.
Change-Id: I86cc7985bace8b6a93ad2c75d2bef5c3c2cb4d61
Mathias Agopian [Tue, 5 Oct 2010 03:04:42 +0000 (20:04 -0700)]
Merge "refactored screenshot code" into gingerbread
Mathias Agopian [Tue, 5 Oct 2010 03:04:37 +0000 (20:04 -0700)]
Merge "new screencap command" into gingerbread
Adam Powell [Tue, 5 Oct 2010 02:56:49 +0000 (19:56 -0700)]
Merge "Fix bug
3061769" into gingerbread
Mathias Agopian [Tue, 5 Oct 2010 02:50:16 +0000 (19:50 -0700)]
Merge "fix [
3008290] passion GB surface does not send surfaceChanged notification after size change." into gingerbread
Elliott Hughes [Tue, 5 Oct 2010 01:51:38 +0000 (18:51 -0700)]
Merge "Manually revert a single-line error inserted by OpenJDK." into gingerbread
James Dong [Tue, 5 Oct 2010 01:37:48 +0000 (18:37 -0700)]
Merge "Fixed an issue where the reserved free space in the file writer was larger than intended" into gingerbread
Nick Pelly [Tue, 5 Oct 2010 01:21:57 +0000 (18:21 -0700)]
Merge "New API stubs: NdefMessage and NdefRecord." into gingerbread
Mathias Agopian [Wed, 29 Sep 2010 20:02:36 +0000 (13:02 -0700)]
refactored screenshot code
the core screenshot function now can capture the screen at any lower resolution
performing bilinear filtering.
we also now have some client code to interface with the screenshot service.
it's now possible to request a screenshot at a lower resolution.
Change-Id: I33689bba98507ab928d0898b21596d0d2fe4b953
Kenny Root [Tue, 5 Oct 2010 00:08:26 +0000 (17:08 -0700)]
Merge "Use pread() in ZipFileRO for Linux" into gingerbread
Gilles Debunne [Mon, 4 Oct 2010 23:42:40 +0000 (16:42 -0700)]
Merge "DO NOT MERGE. Select word no longer selects spaces between words." into gingerbread
Scott Main [Mon, 4 Oct 2010 23:31:47 +0000 (16:31 -0700)]
am
46ffeb21: docs: update homepage with more countries for market announcement
Merge commit '
46ffeb218859a543540a70b3229a48d2d96cbb4a' into gingerbread
* commit '
46ffeb218859a543540a70b3229a48d2d96cbb4a':
docs: update homepage with more countries for market announcement
Scott Main [Mon, 4 Oct 2010 22:39:24 +0000 (15:39 -0700)]
am
6ef33cb3: docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38
Merge commit '
6ef33cb3b8c9ec8f6c2bb387d9a61affea64ec0d' into gingerbread
* commit '
6ef33cb3b8c9ec8f6c2bb387d9a61affea64ec0d':
docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38
James Dong [Mon, 4 Oct 2010 22:35:40 +0000 (15:35 -0700)]
Merge "Resilent media time stamp adjustment" into gingerbread
Gilles Debunne [Mon, 4 Oct 2010 22:34:43 +0000 (15:34 -0700)]
Merge "Removed icon in Alert dialog header." into gingerbread
Adam Powell [Mon, 4 Oct 2010 22:24:29 +0000 (15:24 -0700)]
Merge "Fix bug
3052686 - ScrollView padding treated incorrectly" into gingerbread
Kenny Root [Mon, 4 Oct 2010 21:20:14 +0000 (14:20 -0700)]
Use pread() in ZipFileRO for Linux
AssetManager instances are created by zygote and passed to all its
children so that they don't have to individually open
frameworks-res.apk. This creates a problem for determining the current
file offset when using lseek() on those files, because you can't
guarantee the cross-process locking of a mutex. Luckily, Linux
implements pread() to get around this suckiness.
The problem is that only Linux implements this, so we have to keep the
old locking for use on host builds with aapt and friends. aapt doesn't
have this same problem of sharing file descriptors across forked
processes, so we can keep the local AutoMutex to protect accesses of
those files.
Change-Id: Ibe9f11499a53fe345f50fbaea438815ec0fd363e
Dianne Hackborn [Mon, 4 Oct 2010 21:52:12 +0000 (14:52 -0700)]
Merge "Fix issue #
3041660: Camera image flips upside down when rotating device" into gingerbread
Gilles Debunne [Mon, 4 Oct 2010 21:43:16 +0000 (14:43 -0700)]
Merge "New green in assets for battery, download, upload" into gingerbread
Joe Onorato [Mon, 4 Oct 2010 21:41:38 +0000 (14:41 -0700)]
Merge "implement the number bubbles on the status bar" into gingerbread
Scott Main [Mon, 4 Oct 2010 21:32:26 +0000 (14:32 -0700)]
am
ec80d7f3: docs: consistency fixit for the quickview boxes in the dev guide
Merge commit '
ec80d7f311b1a0899bb4caf5b380b07027e902d1' into gingerbread
* commit '
ec80d7f311b1a0899bb4caf5b380b07027e902d1':
docs: consistency fixit for the quickview boxes in the dev guide
Patrick Dubroy [Mon, 4 Oct 2010 21:20:39 +0000 (14:20 -0700)]
Merge "Fix 2-pixel offset unlock jog tab" into gingerbread
Brad Fitzpatrick [Mon, 4 Oct 2010 19:21:14 +0000 (12:21 -0700)]
Merge "Document Bitmap.createScaledBitmap" into gingerbread
Adam Powell [Mon, 4 Oct 2010 19:15:34 +0000 (12:15 -0700)]
Merge "Fix bug
3058324" into gingerbread
Gilles Debunne [Mon, 4 Oct 2010 19:06:10 +0000 (12:06 -0700)]
Merge "Bug fixes in Text selection." into gingerbread
Dianne Hackborn [Mon, 4 Oct 2010 18:58:09 +0000 (11:58 -0700)]
Merge "Don't write settings multiple times when unmounting." into gingerbread
Chia-chi Yeh [Mon, 4 Oct 2010 18:51:45 +0000 (11:51 -0700)]
Merge "RTP: Add a baseline echo suppressor." into gingerbread
Andreas Huber [Mon, 4 Oct 2010 18:45:56 +0000 (11:45 -0700)]
Merge "Make sure to finish the preparation phase even EOS occurs before we consider the cache to be completely filled up." into gingerbread
Andreas Huber [Mon, 4 Oct 2010 18:20:21 +0000 (11:20 -0700)]
Merge "Don't retrieve metadata unless necessary for ogg-vorbis ringtone auto-looping." into gingerbread
Dirk Dougherty [Mon, 4 Oct 2010 18:12:07 +0000 (11:12 -0700)]
am
ba944ccd: Doc change: update screens support table and remove outdated density/size metrics.
Merge commit '
ba944ccda3d61ccbe6061277fcc50c96fe2643f1' into gingerbread
* commit '
ba944ccda3d61ccbe6061277fcc50c96fe2643f1':
Doc change: update screens support table and remove outdated density/size metrics.
Mindy Pereira [Mon, 4 Oct 2010 17:10:06 +0000 (10:10 -0700)]
Merge "DO NOT MERGE. Fix logic for switching between overscroll and scroll modes." into gingerbread
Daisuke Miyakawa [Mon, 4 Oct 2010 15:31:56 +0000 (08:31 -0700)]
Merge "Refrain warning when not appropriate. Do not merge" into gingerbread
Kenny Root [Mon, 4 Oct 2010 14:28:20 +0000 (07:28 -0700)]
Merge "ZipFileRO: moar logging and wrap close" into gingerbread
Hung-ying Tyan [Mon, 4 Oct 2010 05:43:28 +0000 (22:43 -0700)]
Merge "SIP: minor fixes." into gingerbread
Jeff Brown [Sat, 2 Oct 2010 02:01:11 +0000 (19:01 -0700)]
Merge "Wait for initial device scan to finish before updating config." into gingerbread
Jeff Brown [Sat, 2 Oct 2010 01:58:32 +0000 (18:58 -0700)]
Merge "Minor logging changes to input dispatcher to help with debugging." into gingerbread
Jeff Brown [Sat, 2 Oct 2010 01:55:43 +0000 (18:55 -0700)]
Wait for initial device scan to finish before updating config.
This change narrows the opportunity for a race condition setting the
resource Configuration while devices are being updated.
Change-Id: I58efa563f4129ab0fce7108511d16a99dff7e451
Kenny Root [Sat, 2 Oct 2010 01:28:28 +0000 (18:28 -0700)]
ZipFileRO: moar logging and wrap close
There is apparently still a race upon reading the entry Local File
Header that can't be tracked down, so move the LFH check inside the
mutex-protected block so we can call lseek again to see where we are
when we log an error.
Also, close() can fail so use TEMP_FAILURE_RETRY on it so we don't
unwittingly leak file descriptors when Mean Mr. EINTR comes a-knocking.
Change-Id: I753abad0bd882fe28f7281c406fa76f64393ef4c
Jeff Brown [Sat, 2 Oct 2010 00:46:21 +0000 (17:46 -0700)]
Minor logging changes to input dispatcher to help with debugging.
Added dumpsys reporting to EventHub.
Made the formatting a bit clearer.
Added 'Locked' suffix to some internal methods of EventHub.
Change-Id: Ic449560bcce378f6361895d27c66854e9724abb0
James Dong [Sat, 2 Oct 2010 00:27:51 +0000 (17:27 -0700)]
Merge "Turn off media time adjustment by default" into gingerbread
Dianne Hackborn [Fri, 1 Oct 2010 23:46:29 +0000 (16:46 -0700)]
Merge "Some documentation fixes." into gingerbread
Jeff Brown [Fri, 1 Oct 2010 23:09:58 +0000 (16:09 -0700)]
Merge "Support haptic feedback for virtual keys defined in key layout." into gingerbread
Chia-chi Yeh [Fri, 1 Oct 2010 22:34:43 +0000 (15:34 -0700)]
Merge "KeyStore: Update the parameters of generating master keys." into gingerbread
Scott Main [Fri, 1 Oct 2010 22:11:10 +0000 (15:11 -0700)]
am
32441bbe: docs: device dashboard update for 10/1
Merge commit '
32441bbe61e2f02f09a319c00895aef8cfc27ff4' into gingerbread
* commit '
32441bbe61e2f02f09a319c00895aef8cfc27ff4':
docs: device dashboard update for 10/1
Jeff Brown [Fri, 1 Oct 2010 21:55:30 +0000 (14:55 -0700)]
Support haptic feedback for virtual keys defined in key layout.
Change-Id: I83e4108a87332692e03791dc066206becbc7941f
Hung-ying Tyan [Fri, 1 Oct 2010 21:52:00 +0000 (14:52 -0700)]
Merge "Add CallManager/Phone.setEchoSuppressionEnabled()." into gingerbread
Adam Powell [Fri, 1 Oct 2010 21:46:40 +0000 (14:46 -0700)]
Merge "DO NOT MERGE Fix bug
3026771, other design/asset fixes." into gingerbread
Kenny Root [Fri, 1 Oct 2010 21:06:46 +0000 (14:06 -0700)]
Merge "Add "none" for vold and deprecate mkobb -c" into gingerbread
Dianne Hackborn [Fri, 1 Oct 2010 20:39:39 +0000 (13:39 -0700)]
Merge "Fix issue #
3037083: Problem report for Pinball" into gingerbread
Steve Howard [Fri, 1 Oct 2010 20:12:39 +0000 (13:12 -0700)]
Merge "A few additions to the download manager public API documentation" into gingerbread
Andreas Huber [Fri, 1 Oct 2010 18:35:17 +0000 (11:35 -0700)]
Merge "Start playing live streams from the start, no the middle..." into gingerbread
Fabrice Di Meglio [Fri, 1 Oct 2010 18:30:50 +0000 (11:30 -0700)]
Merge "Fix bug #
3055578 ("adb shell bmgr list sets" generates NPE and cannot be run again when device has no account setup)" into gingerbread
Andreas Huber [Fri, 1 Oct 2010 18:23:24 +0000 (11:23 -0700)]
Merge "Remove development-only code." into gingerbread
Erik [Fri, 1 Oct 2010 18:08:13 +0000 (11:08 -0700)]
Merge "b/
3054044 Make allDay event times format in utc" into gingerbread
Andreas Huber [Fri, 1 Oct 2010 18:01:33 +0000 (11:01 -0700)]
Merge "Squashed commit of the following:" into gingerbread