OSDN Git Service
Robert Ly [Wed, 13 Jul 2011 21:54:44 +0000 (14:54 -0700)]
am
4e400158: am
1e4cf2dd: am
10a36020: cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a
* commit '
4e4001589911b971d56c72acee140526d4575dac':
cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a
Scott Main [Wed, 13 Jul 2011 21:54:24 +0000 (14:54 -0700)]
am
22f4e8f6: am
56a085c9: am
d3fa7bd1: docs: fix date on opengl dashboard
* commit '
22f4e8f627e3f54b418da422eadcf0c43caa3499':
docs: fix date on opengl dashboard
Xavier Ducrohet [Wed, 13 Jul 2011 21:53:54 +0000 (14:53 -0700)]
Mike Lockwood [Wed, 13 Jul 2011 21:33:13 +0000 (14:33 -0700)]
Merge "MediaScanner: fix breakage in updates"
Robert Ly [Wed, 13 Jul 2011 21:28:52 +0000 (14:28 -0700)]
Merge "docs: fix for bug
3186839"
Svetoslav Ganov [Wed, 13 Jul 2011 21:19:33 +0000 (14:19 -0700)]
Merge "Polish of the ActivityChooserView and ShareActionProvider."
repo sync [Wed, 13 Jul 2011 21:09:33 +0000 (14:09 -0700)]
Merge "Add REFER handling."
Chris Craik [Wed, 13 Jul 2011 21:08:11 +0000 (14:08 -0700)]
Merge "Tile profiling interface"
Mathias Agopian [Wed, 13 Jul 2011 21:07:01 +0000 (14:07 -0700)]
Merge "get rid of overlay HAL"
Jeff Brown [Wed, 13 Jul 2011 20:00:38 +0000 (13:00 -0700)]
Merge "Revert "fix a weird use of Vector::appendVector()""
Jason Sams [Wed, 13 Jul 2011 19:28:38 +0000 (12:28 -0700)]
Merge "Add slot number to forEach hal."
Mike Lockwood [Wed, 13 Jul 2011 15:07:59 +0000 (08:07 -0700)]
Merge "MTP: Clean up MtpServer initialization and threading:"
Mike Lockwood [Wed, 13 Jul 2011 14:34:29 +0000 (07:34 -0700)]
Merge "UsbDeviceManager: clean up HandlerThread creation"
Narayan Kamath [Wed, 13 Jul 2011 14:30:27 +0000 (07:30 -0700)]
Merge "Wait until the audio track finishes playing before releasing it."
Jeff Sharkey [Wed, 13 Jul 2011 03:23:03 +0000 (20:23 -0700)]
Merge "Include full network history around current time."
Romain Guy [Wed, 13 Jul 2011 02:10:22 +0000 (19:10 -0700)]
Merge "Revert "Don't preload HardwareRenderer, its static initialization is process dependant.""
Fabrice Di Meglio [Wed, 13 Jul 2011 01:24:27 +0000 (18:24 -0700)]
Merge "Introduce TextView drawableStart and drawableEnd"
Romain Guy [Wed, 13 Jul 2011 01:18:11 +0000 (18:18 -0700)]
Merge "Don't preload HardwareRenderer, its static initialization is process dependant."
Iliyan Malchev [Wed, 13 Jul 2011 00:40:25 +0000 (17:40 -0700)]
Merge "Add support for TI H264 encoder"
Mathias Agopian [Wed, 13 Jul 2011 00:36:22 +0000 (17:36 -0700)]
Merge "take the state transform into account with h/w composer hal"
Chia-chi Yeh [Tue, 12 Jul 2011 23:58:45 +0000 (16:58 -0700)]
am
3b219a51: (-s ours) am
4821d3bd: Merge "VpnService: stop VPN when unknown DNS servers show up." into honeycomb-LTE
* commit '
3b219a51a9d692807d3fb0f516df81609ca6e4fc':
VpnService: stop VPN when unknown DNS servers show up.
Elliott Hughes [Tue, 12 Jul 2011 23:58:18 +0000 (16:58 -0700)]
Merge "Fix typo in AndroidHttpClient JavaDoc."
Gilles Debunne [Tue, 12 Jul 2011 23:38:51 +0000 (16:38 -0700)]
Merge "Refactored TextView selectable state methods."
Wink Saville [Tue, 12 Jul 2011 23:38:22 +0000 (16:38 -0700)]
am
0ddd9960: am
12b91edc: Merge "Add a property so that CSIM provision check can be bypassed" into honeycomb-LTE
* commit '
0ddd99600675aaf5f514ac6bb30d345c4b66f8c2':
Add a property so that CSIM provision check can be bypassed
Alex Sakhartchouk [Tue, 12 Jul 2011 23:27:09 +0000 (16:27 -0700)]
Merge "Fix for the renderscript ref counting bug."
Jaikumar Ganesh [Tue, 12 Jul 2011 22:54:50 +0000 (15:54 -0700)]
Merge "Add REGISTERED_BEFORE_BOOT flag to intent."
Jeff Sharkey [Tue, 12 Jul 2011 22:19:31 +0000 (15:19 -0700)]
Merge "Hide NetworkStatsHistory internals."
Jeff Sharkey [Tue, 12 Jul 2011 22:18:41 +0000 (15:18 -0700)]
Merge "Watch for external Secure.DATA_ROAMING changes."
Adam Powell [Tue, 12 Jul 2011 22:08:37 +0000 (15:08 -0700)]
Merge "Update ActionProvider to support dynamically building submenus."
Kazuhiro Ondo [Tue, 12 Jul 2011 21:56:59 +0000 (14:56 -0700)]
am
a9e00a4a: am
89799e72: Fix incorrect ERI banner format
* commit '
a9e00a4ac806751d8af0d9386ee3ae9bd18492b4':
Fix incorrect ERI banner format
Mathias Agopian [Tue, 12 Jul 2011 21:51:45 +0000 (14:51 -0700)]
take the state transform into account with h/w composer hal
if the state transform didn't preserve rectangles, we
would still try to use h/w composer hal using the bounds
of the transformed rect, which isn't correct.
now we correctly fall back to composition.
Change-Id: Iff78f4339ece415d4987e95a5717b04934d370ab
Wink Saville [Tue, 12 Jul 2011 21:46:02 +0000 (14:46 -0700)]
Merge "resolved conflicts for merge of
99cd6671 to master"
James Dong [Tue, 12 Jul 2011 21:43:34 +0000 (14:43 -0700)]
Merge "Make MetadataBufferType.h C-friendly"
Svetoslav Ganov [Tue, 12 Jul 2011 21:39:07 +0000 (14:39 -0700)]
Merge "Date/time pickers and calendar view not handling locale change."
Mathias Agopian [Tue, 12 Jul 2011 21:11:57 +0000 (14:11 -0700)]
Merge "fix typo in a comment"
Wink Saville [Tue, 12 Jul 2011 20:56:05 +0000 (13:56 -0700)]
resolved conflicts for merge of
99cd6671 to master
Change-Id: I81ac18b1b8291a96bdfa3386f2fe3633fd7eeb79
Xavier Ducrohet [Tue, 12 Jul 2011 20:39:33 +0000 (13:39 -0700)]
Merge "LayoutLib: updated fake accessbility manager and ensure there's an InputMethodManager"
Jeff Brown [Tue, 12 Jul 2011 19:15:07 +0000 (12:15 -0700)]
Merge "Remove the simulator target from all makefiles. Bug:
5010576"
Romain Guy [Tue, 12 Jul 2011 19:14:11 +0000 (12:14 -0700)]
Merge "Add test for bug #
4970944"
Xavier Ducrohet [Tue, 12 Jul 2011 19:03:23 +0000 (12:03 -0700)]
Merge "LayoutLib: Delegate for Display and IWindowManager implementation."
Chet Haase [Tue, 12 Jul 2011 18:58:58 +0000 (11:58 -0700)]
Merge "Fix Animator cancel() behavior"
Xavier Ducrohet [Tue, 12 Jul 2011 18:50:07 +0000 (11:50 -0700)]
Merge "new button graphics for layoutlib."
Dave Santoro [Tue, 12 Jul 2011 18:39:09 +0000 (11:39 -0700)]
Merge "Add data_set column for raw contacts and groups."
Adam Powell [Tue, 12 Jul 2011 18:36:43 +0000 (11:36 -0700)]
Merge "Fix bugs around restoring submenu state after activity teardown/restore"
Jeff Sharkey [Tue, 12 Jul 2011 18:09:09 +0000 (11:09 -0700)]
Merge "Return stats from inactive ifaces, packet counts."
Fabrice Di Meglio [Tue, 12 Jul 2011 16:39:18 +0000 (09:39 -0700)]
Merge "Fix scrolling bug causing centered cursor."
Ben Murdoch [Tue, 12 Jul 2011 15:51:23 +0000 (08:51 -0700)]
Merge changes I829b5d24,I521c0989
* changes:
Add missing auto-fill strings.
Merge Chromium at r12.0.742.93: Update auto-fill regular expressions.
Mark Brophy [Tue, 12 Jul 2011 09:57:16 +0000 (02:57 -0700)]
Merge "Expose app resume times to the ApplicationProvider."
satok [Tue, 12 Jul 2011 05:12:59 +0000 (22:12 -0700)]
Merge "Change IME picker dialog from Activity to Broadcast"
Jeff Brown [Tue, 12 Jul 2011 05:12:16 +0000 (22:12 -0700)]
Remove the simulator target from all makefiles.
Bug:
5010576
Change-Id: I04d722f258951a3078fe07899f5bbe8aac02a8e8
Mathias Agopian [Tue, 12 Jul 2011 01:30:41 +0000 (18:30 -0700)]
Merge "fix a weird use of Vector::appendVector()"
Mathias Agopian [Tue, 12 Jul 2011 01:30:29 +0000 (18:30 -0700)]
Merge "Fix typo in an assert's log"
Jamie Gennis [Tue, 12 Jul 2011 00:14:33 +0000 (17:14 -0700)]
Merge changes I002177a6,Ibaff52fe
* changes:
Add the EGL_ANDROID_recordable spec.
Add the spec for EGL_ANDROID_blob_cache.
Jamie Gennis [Sat, 9 Jul 2011 01:11:49 +0000 (18:11 -0700)]
Add the EGL_ANDROID_recordable spec.
Change-Id: I002177a68fafd6bb941aa64445c85fd5ff56223a
Robert Greenwalt [Mon, 11 Jul 2011 23:47:25 +0000 (16:47 -0700)]
Merge "Fix wifi tethering."
Guang Zhu [Mon, 11 Jul 2011 23:45:35 +0000 (16:45 -0700)]
Merge "allow Uri as intent extra in am command"
Mathias Agopian [Mon, 11 Jul 2011 23:26:18 +0000 (16:26 -0700)]
Fix typo in an assert's log
Change-Id: I94883a23a0a92eaf3e4976f942f747a2137499ac
Robert Ly [Mon, 11 Jul 2011 23:05:40 +0000 (16:05 -0700)]
am
1e4cf2dd: am
10a36020: cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a
* commit '
1e4cf2dddbac4d357731ffaf02c4402426aa3763':
cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a
Robert Ly [Mon, 11 Jul 2011 23:03:30 +0000 (16:03 -0700)]
am
10a36020: cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a
* commit '
10a36020e3d37ef088f5f7ed6d64ba35847fc069':
cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a
Jeff Brown [Mon, 11 Jul 2011 23:00:11 +0000 (16:00 -0700)]
Merge "Increase activity timeouts when using a wrapper process."
Scott Main [Mon, 11 Jul 2011 22:53:09 +0000 (15:53 -0700)]
am
56a085c9: am
d3fa7bd1: docs: fix date on opengl dashboard
* commit '
56a085c98801d9c4b08cbf398d8225b6761816ac':
docs: fix date on opengl dashboard
Mike Lockwood [Mon, 11 Jul 2011 22:52:30 +0000 (15:52 -0700)]
Merge "UsbDeviceManager: Include kernel USB state in dumpsys output"
Mike Lockwood [Mon, 11 Jul 2011 22:52:06 +0000 (15:52 -0700)]
Merge "UsbDeviceManager: Initialize state based on persist.sys.usb.config rather than current kernel state"
Scott Main [Mon, 11 Jul 2011 22:50:16 +0000 (15:50 -0700)]
am
d3fa7bd1: docs: fix date on opengl dashboard
* commit '
d3fa7bd1e873d885f00b11bb8123284357ccd362':
docs: fix date on opengl dashboard
Jason Sams [Mon, 11 Jul 2011 22:47:36 +0000 (15:47 -0700)]
Merge "Add error checks for AllocationAdapters being used in unsupported ways."
Jamie Gennis [Mon, 11 Jul 2011 22:47:20 +0000 (15:47 -0700)]
Merge "EGL: fix the ANativeWindow size/fmt override"
Romain Guy [Mon, 11 Jul 2011 22:37:24 +0000 (15:37 -0700)]
Merge "Always make GL calls with a valid EGL context. Bug #
5010760"
Romain Guy [Mon, 11 Jul 2011 22:33:51 +0000 (15:33 -0700)]
Always make GL calls with a valid EGL context.
Bug #
5010760
Change-Id: If7500ef69683948e727df1406f458f18b11259d1
Eric Laurent [Mon, 11 Jul 2011 22:20:27 +0000 (15:20 -0700)]
Merge "Audio Effect API: process reverse stream function"
Daniel Lehmann [Mon, 11 Jul 2011 22:10:04 +0000 (15:10 -0700)]
Merge "Remove restricted white-listing"
Jaikumar Ganesh [Mon, 11 Jul 2011 21:41:02 +0000 (14:41 -0700)]
Merge "Query the correct Extra for BT intents."
Shimeng (Simon) Wang [Mon, 11 Jul 2011 21:40:04 +0000 (14:40 -0700)]
Merge "Set mActualScale when initialScale is set."
Jaikumar Ganesh [Mon, 11 Jul 2011 21:17:57 +0000 (14:17 -0700)]
Merge "Bluetooth Health APIs"
Jeff Brown [Mon, 11 Jul 2011 20:41:26 +0000 (13:41 -0700)]
Merge "Remove more simulator support code. Bug:
5010576"
Adam Powell [Mon, 11 Jul 2011 20:39:45 +0000 (13:39 -0700)]
Merge "New assets from UX for dialogs/menu frames"
Jeff Brown [Mon, 11 Jul 2011 20:37:53 +0000 (13:37 -0700)]
Merge "Eliminate single-process mode. Bug:
5010576"
Jeff Brown [Mon, 11 Jul 2011 20:04:53 +0000 (13:04 -0700)]
Remove more simulator support code.
Bug:
5010576
Change-Id: Ie6c8665306bf4e822693b76f25c3a0f05c12d42d
James Dong [Mon, 11 Jul 2011 19:56:11 +0000 (12:56 -0700)]
Merge "Do not wait for unlaunched threads in stop()"
James Dong [Mon, 11 Jul 2011 19:46:35 +0000 (12:46 -0700)]
Merge "Release camera if CameraSource::start() has not been called"
Xavier Ducrohet [Mon, 11 Jul 2011 19:46:07 +0000 (12:46 -0700)]
Xavier Ducrohet [Mon, 11 Jul 2011 19:43:15 +0000 (12:43 -0700)]
Jamie Gennis [Fri, 1 Jul 2011 20:12:07 +0000 (13:12 -0700)]
EGL: fix the ANativeWindow size/fmt override
This change fixes how the Android EGL layer overrides the size and
format of an ANativeWindow in eglCreateWindowSurface. The new behavior
is to leave the size untouched when overriding the format. The previous
behavior was to reset the ANativeWindow to use the default size set by
the ANativeWindow implementation.
It also adds two new 'perform' methods to the ANativeWindow interface:
set_buffers_dimensions and set_buffers_format, and redefines the
behavior of set_buffers_geometry to be the combination of these two new
methods.
Additionally, this change adds an error check for the return value of
the new native_window_set_buffers_format call, which required adding a
(stub) handler for to FramebufferNativeWindow.
Change-Id: I805c7ccd8d4730dfb132d10d8bc3fb058a0b9df1
Mike Lockwood [Mon, 11 Jul 2011 19:15:21 +0000 (12:15 -0700)]
Merge "Remove unnecessary locking from MediaScanner JNI code"
Jamie Gennis [Fri, 8 Jul 2011 20:59:43 +0000 (13:59 -0700)]
Add the spec for EGL_ANDROID_blob_cache.
Change-Id: Ibaff52fee5c856283536ad37251cc80a9f3f938b
Elliott Hughes [Mon, 11 Jul 2011 18:24:54 +0000 (11:24 -0700)]
Merge "SDK_INT is not "current" on unreleased builds."
Andy McFadden [Mon, 11 Jul 2011 18:24:23 +0000 (11:24 -0700)]
Merge "Relocate common Calendar classes"
Fabrice Di Meglio [Mon, 11 Jul 2011 17:52:09 +0000 (10:52 -0700)]
Merge "Fix View reset of layoutDirection and textDirection"
Freeman Ng [Mon, 11 Jul 2011 17:46:12 +0000 (10:46 -0700)]
Merge "remove old style button bar look"
Mike Lockwood [Mon, 11 Jul 2011 17:41:52 +0000 (10:41 -0700)]
Merge "UsbDeviceManager: Fix indentation"
Mike Lockwood [Mon, 11 Jul 2011 17:41:08 +0000 (10:41 -0700)]
Merge "MTP: Return error if user tries to copy a file >= 4GB to a FAT32 file system"
Chia-chi Yeh [Mon, 11 Jul 2011 17:29:32 +0000 (10:29 -0700)]
am
4821d3bd: Merge "VpnService: stop VPN when unknown DNS servers show up." into honeycomb-LTE
* commit '
4821d3bdf8ce35408c6a10fe45c39a5e701ea8e2':
VpnService: stop VPN when unknown DNS servers show up.
Chia-chi Yeh [Mon, 11 Jul 2011 17:25:28 +0000 (10:25 -0700)]
Merge "VpnService: stop VPN when unknown DNS servers show up." into honeycomb-LTE
Mike Lockwood [Mon, 11 Jul 2011 16:12:21 +0000 (09:12 -0700)]
Merge "MediaScanner: Use bulk inserts when in batch mode"
Wink Saville [Mon, 11 Jul 2011 02:35:14 +0000 (19:35 -0700)]
am
12b91edc: Merge "Add a property so that CSIM provision check can be bypassed" into honeycomb-LTE
* commit '
12b91edc81763b69090bf5815bc8d59ab8d8f342':
Add a property so that CSIM provision check can be bypassed
Wink Saville [Mon, 11 Jul 2011 02:33:54 +0000 (19:33 -0700)]
Merge "Add a property so that CSIM provision check can be bypassed" into honeycomb-LTE
Kazuhiro Ondo [Mon, 11 Jul 2011 00:21:52 +0000 (17:21 -0700)]
am
89799e72: Fix incorrect ERI banner format
* commit '
89799e72eee54935ec5830f89dfd0a7d32983917':
Fix incorrect ERI banner format
Jeff Sharkey [Sun, 10 Jul 2011 23:18:58 +0000 (16:18 -0700)]
Merge "Cached NTP time for system services."
Kazuhiro Ondo [Sun, 10 Jul 2011 23:16:54 +0000 (16:16 -0700)]
am
64ba5eaa: Concurrent multi-PDP support in TrafficStats
* commit '
64ba5eaa40614877c679b3fbaaa3c2efd17d50d2':
Concurrent multi-PDP support in TrafficStats
Jim Miller [Sun, 10 Jul 2011 21:35:32 +0000 (14:35 -0700)]
Merge "Fix
4942542,
4590542: Password unlock fixes"
Jeff Brown [Sat, 9 Jul 2011 01:52:57 +0000 (18:52 -0700)]
Eliminate single-process mode.
Bug:
5010576
Change-Id: Id450dc83efed4897d1e4ff451530fed14457aace