OSDN Git Service
James Dong [Tue, 7 Dec 2010 00:45:08 +0000 (16:45 -0800)]
am
23b791cd: am
d57fbe88: Fixed a race condition where some recording frames may not be released
* commit '
23b791cd0f725d188b84dabfd9eeab4e3775b869':
Fixed a race condition where some recording frames may not be released
Jean-Baptiste Queru [Tue, 7 Dec 2010 00:44:50 +0000 (16:44 -0800)]
am
465e88eb: am
1ee2394e: am
1d67fa5b: Merge "Changing connect and response timeout."
* commit '
465e88eb008408d4e655ca7bdd9c2b3ac305e54b':
Changing connect and response timeout.
James Dong [Mon, 6 Dec 2010 23:36:04 +0000 (15:36 -0800)]
am
d57fbe88: Fixed a race condition where some recording frames may not be released
* commit '
d57fbe887fabd027e644caeaa2139c863143a786':
Fixed a race condition where some recording frames may not be released
Brian Carlstrom [Mon, 6 Dec 2010 23:30:34 +0000 (15:30 -0800)]
Merge "Tracking dalvik.bytecode.* API changes"
Jesse Wilson [Mon, 6 Dec 2010 23:24:28 +0000 (15:24 -0800)]
Merge "Test that we use proxies specified by system properties."
Fred Quintana [Mon, 6 Dec 2010 23:18:58 +0000 (15:18 -0800)]
Merge "make sure that pending operation reconstituted from disk always have an extras bundle"
Jean-Baptiste Queru [Mon, 6 Dec 2010 22:33:03 +0000 (14:33 -0800)]
Merge "Merge from gingerbread-plus-aosp"
Wei-Ta Chen [Mon, 6 Dec 2010 22:32:32 +0000 (14:32 -0800)]
Merge "Add inPreferQualityOverSpeed into BitmapFactory.Options."
Jean-Baptiste Queru [Mon, 6 Dec 2010 22:31:25 +0000 (14:31 -0800)]
Merge from gingerbread-plus-aosp
Change-Id: I154071687cdd51c28bb377ea3f1e818e96909b56
Jean-Baptiste Queru [Mon, 6 Dec 2010 22:21:07 +0000 (14:21 -0800)]
Merge "Merge from gingerbread-plus-aosp"
James Dong [Mon, 6 Dec 2010 22:18:18 +0000 (14:18 -0800)]
Merge "Remove check if the target video resolution is not supported by CameraSource and clean up Camera is CameraSource could not created."
Jean-Baptiste Queru [Mon, 6 Dec 2010 22:08:37 +0000 (14:08 -0800)]
Merge from gingerbread-plus-aosp
Change-Id: I0f4726870be5791e62f98fb45afd82b20f8ffba0
Gilles Debunne [Mon, 6 Dec 2010 21:57:47 +0000 (13:57 -0800)]
Merge "Moved Paste popup window up in TextView"
Jean-Baptiste Queru [Mon, 6 Dec 2010 21:46:19 +0000 (13:46 -0800)]
am
1ee2394e: am
1d67fa5b: Merge "Changing connect and response timeout."
* commit '
1ee2394edd4b90111f8174862c7c0f435e1a3634':
Changing connect and response timeout.
Jean-Baptiste Queru [Mon, 6 Dec 2010 21:43:36 +0000 (13:43 -0800)]
am
1d67fa5b: Merge "Changing connect and response timeout."
* commit '
1d67fa5b110a1df21e408d450394fb62d5dc9a1e':
Changing connect and response timeout.
Jean-Baptiste Queru [Mon, 6 Dec 2010 21:39:19 +0000 (13:39 -0800)]
Merge "Changing connect and response timeout."
Irfan Sheriff [Mon, 6 Dec 2010 20:47:31 +0000 (12:47 -0800)]
Merge "Update scan results when frequency band is set"
Nick Pelly [Mon, 6 Dec 2010 19:55:08 +0000 (11:55 -0800)]
am
cbf4e352: am
3d524e56: Merge gingerbread-nfc into gingerbread
* commit '
cbf4e3525be80607c4d68630faf927ce6a717f72':
First implementation of MifareUltralight
Nick Pelly [Mon, 6 Dec 2010 19:50:47 +0000 (11:50 -0800)]
resolved conflicts for merge of
28e8c66d to master
Change-Id: I9746fd7478d3954b491179ffbd241f481cc2fb6c
Guang Zhu [Mon, 6 Dec 2010 19:36:54 +0000 (11:36 -0800)]
Merge "disable HW acceleration"
Xavier Ducrohet [Mon, 6 Dec 2010 19:32:43 +0000 (11:32 -0800)]
Merge "LayoutLib: Update font object when text info changes in paint delegate"
Guang Zhu [Mon, 6 Dec 2010 19:28:49 +0000 (11:28 -0800)]
Merge "change how assets are copied out of apk"
Daniel Sandler [Mon, 6 Dec 2010 19:15:45 +0000 (11:15 -0800)]
Merge "Hide navigation buttons and clock on lockscreen."
Jean-Baptiste Queru [Mon, 6 Dec 2010 19:05:47 +0000 (11:05 -0800)]
am
005dd44b: am
864b1e00: Merge "NumberPicker: Set formatter local value to US."
* commit '
005dd44b756ccd5812ac55f07f93e3e16ce2be0b':
NumberPicker: Set formatter local value to US.
Jean-Baptiste Queru [Mon, 6 Dec 2010 19:03:11 +0000 (11:03 -0800)]
am
864b1e00: Merge "NumberPicker: Set formatter local value to US."
* commit '
864b1e007dc741ec10c23cabc0271f97a5b8c598':
NumberPicker: Set formatter local value to US.
Jean-Baptiste Queru [Mon, 6 Dec 2010 18:57:04 +0000 (10:57 -0800)]
Merge "NumberPicker: Set formatter local value to US."
Irfan Sheriff [Mon, 6 Dec 2010 18:42:58 +0000 (10:42 -0800)]
am
18cbfecd: (-s ours) am
bd3dd73b: Merge "DO NOT MERGE Avoid nullifying dhcp target" into gingerbread
* commit '
18cbfecd8ab587fa049dfc668755a6bd6ddb10d9':
DO NOT MERGE Avoid nullifying dhcp target
Xavier Ducrohet [Mon, 6 Dec 2010 18:40:38 +0000 (10:40 -0800)]
Merge "LayoutLib: Fix logging."
Andy Stadler [Mon, 6 Dec 2010 18:38:04 +0000 (10:38 -0800)]
Merge "Fix notification/builder defaults"
John Wang [Mon, 6 Dec 2010 18:29:49 +0000 (10:29 -0800)]
Merge "Block incoming calls for non-voice-device."
Gilles Debunne [Mon, 6 Dec 2010 18:22:11 +0000 (10:22 -0800)]
Merge "Made TextView use the new localState API for drag info"
Kenny Root [Mon, 6 Dec 2010 18:21:47 +0000 (10:21 -0800)]
Merge "Add measurement API to DefaultContainerService"
Irfan Sheriff [Mon, 6 Dec 2010 18:17:57 +0000 (10:17 -0800)]
Merge "Hold network hand-off wakelock only when connected"
Yu Shan Emily Lau [Mon, 6 Dec 2010 18:14:16 +0000 (10:14 -0800)]
Merge "Suppress the unsupported camera recording size (ie QVGA and SQVGA)"
Fred Quintana [Mon, 6 Dec 2010 17:55:53 +0000 (09:55 -0800)]
Merge "add caching to the AccountManagerService"
Robert Greenwalt [Mon, 6 Dec 2010 17:54:16 +0000 (09:54 -0800)]
Merge "Don't clobber the net hostname if it's already set."
Iain Merrick [Mon, 6 Dec 2010 13:40:48 +0000 (05:40 -0800)]
Merge "Call flushCookieStore() from CookieSyncManager."
satok [Mon, 6 Dec 2010 05:38:30 +0000 (21:38 -0800)]
Merge "Fix null pointer exception"
Jeff Hamilton [Mon, 6 Dec 2010 04:03:59 +0000 (20:03 -0800)]
am
c1576ad6: Update the docs to clarify the ordering constraints.
* commit '
c1576ad627d3d2b2d3c0764c605ebbf3ddc24401':
Update the docs to clarify the ordering constraints.
Jason Sams [Mon, 6 Dec 2010 03:54:18 +0000 (19:54 -0800)]
Merge "Prevent message overrun in LocklessCommandFifo."
Nick Pelly [Mon, 6 Dec 2010 02:13:10 +0000 (18:13 -0800)]
am
3d524e56: Merge gingerbread-nfc into gingerbread
* commit '
3d524e562606e7994ede3429b37937f40f94cd41':
First implementation of MifareUltralight
Nick Pelly [Mon, 6 Dec 2010 02:08:16 +0000 (18:08 -0800)]
Merge gingerbread-nfc into gingerbread
Adam Powell [Mon, 6 Dec 2010 00:49:40 +0000 (16:49 -0800)]
Merge "Add dividers to action bar navigation. Lighter dividers for holo themes."
Nick Pelly [Sun, 5 Dec 2010 22:49:00 +0000 (14:49 -0800)]
am
d8c32332: Merge "Merge branch gingerbread-nfc into gingerbread." into gingerbread
* commit '
d8c323321c28a0a5ff70c6e0694aa822edca4005':
Fixed technology name typo's.
Implement historical bytes / attrib on IsoDep
Provide system code and manufacturer code for Felica tech.
Fixed NfcAdapter init and getTechnology().
Secure Element access implementation
Rough first pass at the NFC technology API.
Revert "Merge "Remove the My Tag feature." into gingerbread"
Nick Pelly [Sun, 5 Dec 2010 22:46:29 +0000 (14:46 -0800)]
Merge "Merge branch gingerbread-nfc into gingerbread." into gingerbread
Nick Pelly [Sun, 5 Dec 2010 22:42:45 +0000 (14:42 -0800)]
Merge branch gingerbread-nfc into gingerbread.
Change-Id: I37d657a16061fddfbb0993463f24d6d3945cddd1
Signed-off-by: Nick Pelly <npelly@google.com>
Dianne Hackborn [Sun, 5 Dec 2010 22:12:19 +0000 (14:12 -0800)]
Merge "Fix up API definitions in master."
James Dong [Sun, 5 Dec 2010 22:07:58 +0000 (14:07 -0800)]
Merge "Replace MediaMetadataRetriever.captureFrame() with MediaMetadataRetriever.getFrameAtTime()"
Adam Powell [Sun, 5 Dec 2010 21:54:07 +0000 (13:54 -0800)]
Merge "Fix bug
3214215 - ListView should stay scrolled to the bottom in transcript mode after a resize"
Adam Powell [Sun, 5 Dec 2010 21:13:19 +0000 (13:13 -0800)]
Merge "Add public style for tabby-looking views"
Dianne Hackborn [Sun, 5 Dec 2010 21:11:57 +0000 (13:11 -0800)]
Merge "Update 9.xml to match the real GB 9.xml."
Irfan Sheriff [Sun, 5 Dec 2010 07:45:18 +0000 (23:45 -0800)]
am
bd3dd73b: Merge "DO NOT MERGE Avoid nullifying dhcp target" into gingerbread
* commit '
bd3dd73b361ad59ae8ad0c1e7e215d974b055fdb':
DO NOT MERGE Avoid nullifying dhcp target
Shimeng (Simon) Wang [Sat, 4 Dec 2010 02:22:29 +0000 (18:22 -0800)]
Merge "Make sure the returned web view width is at least 0."
Irfan Sheriff [Sat, 4 Dec 2010 01:58:17 +0000 (17:58 -0800)]
Merge "DO NOT MERGE Avoid nullifying dhcp target" into gingerbread
Romain Guy [Sat, 4 Dec 2010 00:49:45 +0000 (16:49 -0800)]
Merge "Don't render degenerate triangles in 9patches. Bug #
3251983"
Joe Onorato [Sat, 4 Dec 2010 00:49:39 +0000 (16:49 -0800)]
Merge "make screencap able to save pngs."
James Dong [Fri, 3 Dec 2010 23:36:06 +0000 (15:36 -0800)]
Merge "Prepare for publishing MediaMetadataRetriever as public API"
Chet Haase [Fri, 3 Dec 2010 23:17:01 +0000 (15:17 -0800)]
Merge "Fix invalidation issue for optimized/GL case."
Adam Powell [Fri, 3 Dec 2010 22:42:11 +0000 (14:42 -0800)]
Merge "Fix bug
3248342 - resource not found for non-xlarge"
Irfan Sheriff [Fri, 3 Dec 2010 22:29:08 +0000 (14:29 -0800)]
Merge "Fix configuration change handling"
Jim Miller [Fri, 3 Dec 2010 22:21:42 +0000 (14:21 -0800)]
Merge "Fix
3201849: Remove builder pattern from DrawableHolder setters"
Dianne Hackborn [Fri, 3 Dec 2010 21:16:38 +0000 (13:16 -0800)]
Merge "Fix issue #
3175809: system_server crash with SEGV_MAPERR (IKXEVEREST-1372)"
Xavier Ducrohet [Fri, 3 Dec 2010 20:27:27 +0000 (12:27 -0800)]
Merge "LayoutLib: Animation support in insert/move/removeChild actions."
Xavier Ducrohet [Fri, 3 Dec 2010 20:27:14 +0000 (12:27 -0800)]
Merge "LayoutLib: Create new layoutparams when moving a child"
Wink Saville [Fri, 3 Dec 2010 20:16:50 +0000 (12:16 -0800)]
Merge "Cleanup logging."
Jeff Brown [Fri, 3 Dec 2010 19:52:38 +0000 (11:52 -0800)]
Merge "Add method for sending wallpaper commands directly to an engine."
Gilles Debunne [Fri, 3 Dec 2010 19:33:51 +0000 (11:33 -0800)]
Merge "Removed unused text_select_handle asset"
Kenny Root [Fri, 3 Dec 2010 19:23:48 +0000 (11:23 -0800)]
Merge "Move disk usage utilities to its own library"
Amith Yamasani [Fri, 3 Dec 2010 19:22:48 +0000 (11:22 -0800)]
Merge "Use SearchView in SearchDialog for legacy apps using the old model."
Steve Block [Fri, 3 Dec 2010 11:38:00 +0000 (03:38 -0800)]
Merge "Update WebView.addJavascriptInterface() to ignore null instances"
Ben Murdoch [Fri, 3 Dec 2010 11:05:54 +0000 (03:05 -0800)]
Merge "Add a value for the dimensions of xlarge app icons."
Bjorn Bringert [Fri, 3 Dec 2010 09:28:05 +0000 (01:28 -0800)]
Merge "Only decrement mRemaining once in read()."
Wink Saville [Fri, 3 Dec 2010 05:43:00 +0000 (21:43 -0800)]
Merge "Add reason field to DEACTIVATE_DATA_CALL request."
satok [Fri, 3 Dec 2010 03:23:29 +0000 (19:23 -0800)]
Merge "Make the size of "shirt pocket" 0 when the icon of "shirt pocket" is invisible"
Xavier Ducrohet [Fri, 3 Dec 2010 02:06:23 +0000 (18:06 -0800)]
Merge "LayoutLib: Update to use the new moveChild API."
Hung-ying Tyan [Fri, 3 Dec 2010 02:02:58 +0000 (18:02 -0800)]
am
7da1ffc9: am
e2abd103: Merge "Set AudioGroup mode according to audio settings" into gingerbread
* commit '
7da1ffc9d2a51ef6120389a06351fd770ab45f46':
Set AudioGroup mode according to audio settings
Hung-ying Tyan [Fri, 3 Dec 2010 01:56:40 +0000 (17:56 -0800)]
am
e2abd103: Merge "Set AudioGroup mode according to audio settings" into gingerbread
* commit '
e2abd103a2d311738ff1dd1e1d9b8e6c52aa870c':
Set AudioGroup mode according to audio settings
Hung-ying Tyan [Fri, 3 Dec 2010 01:50:33 +0000 (17:50 -0800)]
Merge "Set AudioGroup mode according to audio settings" into gingerbread
Joe Onorato [Fri, 3 Dec 2010 01:29:41 +0000 (17:29 -0800)]
Merge "Tweak the settings panel assets / layout. Not done yet."
Joe Onorato [Fri, 3 Dec 2010 01:29:29 +0000 (17:29 -0800)]
Merge "Make AbsSeekBar support having setThumb called after initialization is done."
Joe Onorato [Fri, 3 Dec 2010 01:29:12 +0000 (17:29 -0800)]
Merge "Brightness and volume controls in the quick settings panel."
Joe Onorato [Fri, 3 Dec 2010 01:29:02 +0000 (17:29 -0800)]
Merge "New SeekBar assets."
Joe Onorato [Fri, 3 Dec 2010 01:28:47 +0000 (17:28 -0800)]
Merge "Show the operator or wifi ssid in the status bar panel."
Romain Guy [Fri, 3 Dec 2010 01:15:05 +0000 (17:15 -0800)]
Merge "Correctly index transparent quads when generating 9patch meshes. Bug #
3250026"
Gilles Debunne [Fri, 3 Dec 2010 00:47:50 +0000 (16:47 -0800)]
Merge "Fix in vertical measurement in text lines with different text sizes"
Xia Wang [Fri, 3 Dec 2010 00:39:53 +0000 (16:39 -0800)]
Merge "Add Wi-Fi connection test for static IP"
Brad Fitzpatrick [Fri, 3 Dec 2010 00:10:02 +0000 (16:10 -0800)]
Merge "sampling profiler hz -> ms"
Jeff Brown [Fri, 3 Dec 2010 00:03:05 +0000 (16:03 -0800)]
Merge "Improve support for external keyboards."
Jeff Brown [Thu, 2 Dec 2010 21:50:46 +0000 (13:50 -0800)]
Improve support for external keyboards.
Use Vendor ID, Product ID and optionally the Version to
locate keymaps and configuration files for external devices.
Moved virtual key definition parsing to native code so that
EventHub can identify touch screens with virtual keys and load
the appropriate key layout file.
Cleaned up a lot of old code in EventHub.
Fixed a regression in ViewRoot's fallback event handling.
Fixed a minor bug in FileMap that caused it to try to munmap
or close invalid handled when released if the attempt to map
the file failed.
Added a couple of new String8 conveniences for formatting strings.
Modified Tokenizer to fall back to open+read when mmap fails since
we can't mmap sysfs files as needed to open the virtual key
definition files in /sys/board_properties/.
Change-Id: I6ca5e5f9547619fd082ddac47e87ce185da69ee6
Jean-Baptiste Queru [Thu, 2 Dec 2010 23:25:18 +0000 (15:25 -0800)]
am
a30c12a1: am
4a88013a: resolved conflicts for merge of
bf1439c5 to stage-korg-master
* commit '
a30c12a18326ed4d608382cd4f970a6e15a58bf5':
Preserve flags field of event passed to injectKeyEvent()
Jean-Baptiste Queru [Thu, 2 Dec 2010 23:21:35 +0000 (15:21 -0800)]
am
4a88013a: resolved conflicts for merge of
bf1439c5 to stage-korg-master
* commit '
4a88013a4a06a9ea80e8419f94694936e6b013f0':
Preserve flags field of event passed to injectKeyEvent()
Jean-Baptiste Queru [Thu, 2 Dec 2010 23:16:53 +0000 (15:16 -0800)]
resolved conflicts for merge of
bf1439c5 to stage-korg-master
Change-Id: Iab543a7ee449025f1df5d58afaa8f8fdd4809c99
James Dong [Thu, 2 Dec 2010 23:01:46 +0000 (15:01 -0800)]
Merge "If camera source uses the metadata, we must use HW encoder Software video encoders are not able to deal with non-YUV metadata in the video buffer sent from camera"
Jean-Baptiste Queru [Thu, 2 Dec 2010 22:56:13 +0000 (14:56 -0800)]
Merge "Preserve flags field of event passed to injectKeyEvent()"
Gil Dobjanschi [Thu, 2 Dec 2010 22:55:48 +0000 (14:55 -0800)]
Merge "Remove the VideoEditorTestImpl"
Fabrice Di Meglio [Thu, 2 Dec 2010 22:32:20 +0000 (14:32 -0800)]
Merge "Add better SQL exception handling to the Sync framework (see bug #
3202693)"
Eric Fischer [Thu, 2 Dec 2010 22:29:03 +0000 (14:29 -0800)]
Merge "Rename Indonesian and Hebrew translations to match Locale.java conventions"
Joe Onorato [Thu, 2 Dec 2010 22:23:20 +0000 (14:23 -0800)]
Merge "Integrating updated SystemUI assets"
Russell Brenner [Thu, 2 Dec 2010 22:11:41 +0000 (14:11 -0800)]
Merge "Merge WebKit at r72274: Update WebKit revision number"
Andreas Huber [Thu, 2 Dec 2010 22:04:55 +0000 (14:04 -0800)]
Merge "Squashed commit of the following:"