OSDN Git Service
Martijn Coenen [Mon, 13 Dec 2010 20:31:29 +0000 (12:31 -0800)]
am
41e74b99: am
b79173f6: Changed technology close() to reconnect to the tag instead of physical disconnect.
* commit '
41e74b991bc50bfa16ba920e998c76a88aa8ae69':
Changed technology close() to reconnect to the tag instead of physical disconnect.
Martijn Coenen [Mon, 13 Dec 2010 20:31:23 +0000 (12:31 -0800)]
am
2019f533: am
fc5a3b6c: Changed transceive on all technologies to "raw", except for Mifare classes.
* commit '
2019f53396f5b45a307cc4b24123eb19b9a5246f':
Changed transceive on all technologies to "raw", except for Mifare classes.
Martijn Coenen [Mon, 13 Dec 2010 20:31:10 +0000 (12:31 -0800)]
am
25556f66: am
3300e4c3: Implemented isWritable() to indicate NDEF capability container r/w state.
* commit '
25556f666934c72ca53ad0f309078e3d4bd29ca9':
Implemented isWritable() to indicate NDEF capability container r/w state.
Kenny Root [Mon, 13 Dec 2010 20:29:06 +0000 (12:29 -0800)]
Merge "Introduce NDK API for 64-bit assets"
Nick Pelly [Mon, 13 Dec 2010 20:25:22 +0000 (12:25 -0800)]
Merge "resolved conflicts for merge of
1d0d1188 to master"
Nick Pelly [Mon, 13 Dec 2010 20:22:34 +0000 (12:22 -0800)]
resolved conflicts for merge of
1d0d1188 to master
Change-Id: I80413d5a54a0284ab6f685c4c6197a2c009ea717
Xavier Ducrohet [Mon, 13 Dec 2010 19:35:42 +0000 (11:35 -0800)]
Merge "LayoutLib: parsed resources were always set as platform res."
Adam Powell [Mon, 13 Dec 2010 18:52:04 +0000 (10:52 -0800)]
Merge "Update bg drawable properly on ActionBars based on earlier changes"
Adam Powell [Mon, 13 Dec 2010 18:47:07 +0000 (10:47 -0800)]
Merge "Smooth out gesture zooming in WebViews."
James Dong [Mon, 13 Dec 2010 18:33:33 +0000 (10:33 -0800)]
Merge "Revert "Allows the authoring engine to skip frame.""
Patrick Scott [Mon, 13 Dec 2010 17:30:27 +0000 (09:30 -0800)]
Merge "Suppress scrollbars during layer fling."
Jean-Michel Trivi [Mon, 13 Dec 2010 17:01:34 +0000 (09:01 -0800)]
Merge "Fix bug
3275151 Request and abandon audio focus with audio mode changes"
Chet Haase [Mon, 13 Dec 2010 16:15:57 +0000 (08:15 -0800)]
Merge "Add ability to reuse bitmaps when decoding PNG content"
Iain Merrick [Mon, 13 Dec 2010 14:22:49 +0000 (06:22 -0800)]
Merge "Move useChromiumHttpStack() from CookieManager to JniUtil."
Leon Scroggins [Mon, 13 Dec 2010 13:56:54 +0000 (05:56 -0800)]
Merge "Use drawLines to draw the outline of the WebTextView."
Mike Lockwood [Sun, 12 Dec 2010 20:22:57 +0000 (12:22 -0800)]
Merge "MTP: Add support for reserve storage setting to avoid low storage situations."
Jason Sams [Sun, 12 Dec 2010 02:52:37 +0000 (18:52 -0800)]
Merge "Add multitouch support to physics test. Fix context state overwrite calling invoke."
Martijn Coenen [Sat, 11 Dec 2010 04:40:40 +0000 (20:40 -0800)]
am
b79173f6: Changed technology close() to reconnect to the tag instead of physical disconnect.
* commit '
b79173f6602359d00a1a89f4d6505a44d461d796':
Changed technology close() to reconnect to the tag instead of physical disconnect.
Martijn Coenen [Sat, 11 Dec 2010 04:40:34 +0000 (20:40 -0800)]
am
fc5a3b6c: Changed transceive on all technologies to "raw", except for Mifare classes.
* commit '
fc5a3b6cfb85679e82a39730c7154b55b0711a0c':
Changed transceive on all technologies to "raw", except for Mifare classes.
Martijn Coenen [Sat, 11 Dec 2010 04:40:26 +0000 (20:40 -0800)]
am
3300e4c3: Implemented isWritable() to indicate NDEF capability container r/w state.
* commit '
3300e4c3ea2f2317532ded6f9e79d6ad9e038679':
Implemented isWritable() to indicate NDEF capability container r/w state.
James Dong [Sat, 11 Dec 2010 01:34:52 +0000 (17:34 -0800)]
Merge "Fixed a failure from timelapse video recording because of accidental use of metadata buffers"
Nick Pelly [Sat, 11 Dec 2010 01:19:45 +0000 (17:19 -0800)]
am
ae56a851: Merge "Make getSystemService(NFC_SERVICE) the NFC entry point." into gingerbread
* commit '
ae56a851624c2b2e78da8a2c339d2caa64c4f981':
Make getSystemService(NFC_SERVICE) the NFC entry point.
Gilles Debunne [Sat, 11 Dec 2010 01:19:06 +0000 (17:19 -0800)]
Merge "TextView's runnable are stopped when the View is detached."
Gilles Debunne [Sat, 11 Dec 2010 01:18:37 +0000 (17:18 -0800)]
Merge "Modified OverScroller curves"
Nick Pelly [Sat, 11 Dec 2010 01:18:00 +0000 (17:18 -0800)]
Merge "Make getSystemService(NFC_SERVICE) the NFC entry point." into gingerbread
John Wang [Sat, 11 Dec 2010 00:55:36 +0000 (16:55 -0800)]
Merge "Notify voicemail only for voice-capable device."
Adam Powell [Sat, 11 Dec 2010 00:33:47 +0000 (16:33 -0800)]
Merge "Fix a bug where the fast scroll track would be positioned incorrectly."
Mathias Agopian [Sat, 11 Dec 2010 00:30:46 +0000 (16:30 -0800)]
Merge "[
3258939] Need snapshot to limit which layers are included"
Mathias Agopian [Sat, 11 Dec 2010 00:22:31 +0000 (16:22 -0800)]
[
3258939] Need snapshot to limit which layers are included
Change-Id: Id7351a0e3f53dde99b291cffba553d89fd4d7ca9
Jason Sams [Sat, 11 Dec 2010 00:06:19 +0000 (16:06 -0800)]
Merge "Remove CreateFromBitmapRef and add CopyTo(bitmap) replacement."
John Wang [Sat, 11 Dec 2010 00:05:51 +0000 (16:05 -0800)]
Merge "Block SMS service for non-sms-capable device."
Amith Yamasani [Fri, 10 Dec 2010 23:39:41 +0000 (15:39 -0800)]
Merge "Potential fix for Settings screen ClassCast exception on the phone."
Xia Wang [Fri, 10 Dec 2010 22:49:18 +0000 (14:49 -0800)]
Merge "Make Wi-Fi stress tests output log consistent. Fix: record average at the beginning of each iteration"
Romain Guy [Fri, 10 Dec 2010 22:42:21 +0000 (14:42 -0800)]
Merge "Ignore empty layers."
Brad Fitzpatrick [Fri, 10 Dec 2010 22:19:58 +0000 (14:19 -0800)]
Merge "StrictMode "custom" trigger support."
Gilles Debunne [Fri, 10 Dec 2010 21:50:51 +0000 (13:50 -0800)]
Merge "Selecting text from a punctuation sign selects previous word."
Dianne Hackborn [Fri, 10 Dec 2010 21:44:13 +0000 (13:44 -0800)]
Merge "Turn off screenshot capturing for thumbnails."
Adam Powell [Fri, 10 Dec 2010 21:30:37 +0000 (13:30 -0800)]
Merge "Fix bug
3257463 - Yes, we SHOULD put the child in the recycler."
Megha Joshi [Fri, 10 Dec 2010 20:52:19 +0000 (12:52 -0800)]
am
87c03b58: (-s ours) am
7a1f15b1: Merge "Integrating webinar hosting with developer.android.com" into gingerbread
* commit '
87c03b58a9468caec18b161128ab14de90764fd4':
Integrating webinar hosting with developer.android.com
Megha Joshi [Fri, 10 Dec 2010 20:33:59 +0000 (12:33 -0800)]
am
7a1f15b1: Merge "Integrating webinar hosting with developer.android.com" into gingerbread
* commit '
7a1f15b1497ba2a79243448f6ac5617264f8c8d3':
Integrating webinar hosting with developer.android.com
Romain Guy [Fri, 10 Dec 2010 20:33:34 +0000 (12:33 -0800)]
Merge "Correctly compare strings in UTF-8 instead of UTF-16 Bug #
3272858"
Megha Joshi [Fri, 10 Dec 2010 20:30:35 +0000 (12:30 -0800)]
Merge "Integrating webinar hosting with developer.android.com" into gingerbread
Xavier Ducrohet [Fri, 10 Dec 2010 20:14:04 +0000 (12:14 -0800)]
Merge "LayoutLib: Adapt to new LayoutLib"
Eric Laurent [Fri, 10 Dec 2010 20:09:06 +0000 (12:09 -0800)]
Merge "Fix audio mode log."
Gilles Debunne [Fri, 10 Dec 2010 19:59:13 +0000 (11:59 -0800)]
Merge "Added visual feedback to text correction."
Wink Saville [Fri, 10 Dec 2010 19:43:33 +0000 (11:43 -0800)]
Merge "Make activation rejection a non-permanent error."
Gilles Debunne [Fri, 10 Dec 2010 19:34:22 +0000 (11:34 -0800)]
Merge "New API in InputConnection to signal IME's text correction."
Eric Fischer [Fri, 10 Dec 2010 18:55:54 +0000 (10:55 -0800)]
Merge "Import revised translations."
John Reck [Fri, 10 Dec 2010 18:21:56 +0000 (10:21 -0800)]
Merge "Fixes Android HTTP cache permissions"
Eric Fischer [Fri, 10 Dec 2010 18:08:10 +0000 (10:08 -0800)]
am
af22f4f1: (-s ours) am
767926bb: Import revised translations. DO NOT MERGE
* commit '
af22f4f16da1823a14f5f60012dffafb14b0d02b':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 10 Dec 2010 18:03:55 +0000 (10:03 -0800)]
am
767926bb: Import revised translations. DO NOT MERGE
* commit '
767926bbe90358bc3857f4b78f54c8cdacfb8773':
Import revised translations. DO NOT MERGE
Jean-Baptiste Queru [Fri, 10 Dec 2010 16:54:14 +0000 (08:54 -0800)]
am
81266d99: am
a218e014: reconcile with open-source gingerbread
* commit '
81266d9936605ab3fb6347d28cd7f4a81d6e23e0':
Jean-Baptiste Queru [Fri, 10 Dec 2010 16:49:37 +0000 (08:49 -0800)]
am
a218e014: reconcile with open-source gingerbread
* commit '
a218e01437c3c47c49ced7ab363bf98fe92cf1e3':
James Dong [Fri, 10 Dec 2010 15:33:13 +0000 (07:33 -0800)]
Merge "We requires camera hal's implementation should not track the ref count of any outstanding video frames and ignore releaseRecordingFrame() call after it receives disableMsgType(CAMERA_MSG_VIDEO_FRAME)."
Ben Murdoch [Fri, 10 Dec 2010 13:52:03 +0000 (05:52 -0800)]
Merge "Add a "Web Search" option to the WebView select text ActionBar"
Adam Powell [Fri, 10 Dec 2010 07:02:11 +0000 (23:02 -0800)]
Merge "Holo scrollbars and related tweaks."
Mike Lockwood [Fri, 10 Dec 2010 06:53:27 +0000 (22:53 -0800)]
Merge "Rename android.hardware.Usb to UsbManager and UsbObserver to UsbService"
James Dong [Fri, 10 Dec 2010 04:27:59 +0000 (20:27 -0800)]
Merge "First step towards renabling Timelapse video recording"
Dianne Hackborn [Fri, 10 Dec 2010 03:25:17 +0000 (19:25 -0800)]
Merge "Fix issue #
3272051: Use backward transition when going backwards."
Jeff Brown [Fri, 10 Dec 2010 02:54:35 +0000 (18:54 -0800)]
Merge "Fix race condition in fallback key processing."
Mike Lockwood [Fri, 10 Dec 2010 02:42:13 +0000 (18:42 -0800)]
Merge "MTP host: Handle receiving a response packet instead of data packet."
Jeff Brown [Fri, 10 Dec 2010 02:10:30 +0000 (18:10 -0800)]
Fix race condition in fallback key processing.
Need to ensure that the channel is still valid before proceeding.
Bug:
3271482
Change-Id: Ia6863cbedd9b53cbc5c9c8815e9ea90bef3d2218
Romain Guy [Fri, 10 Dec 2010 01:47:09 +0000 (17:47 -0800)]
Merge "Don't set the invisible flag when saving an empty layer. Bug #
3270371"
John Wang [Fri, 10 Dec 2010 01:31:36 +0000 (17:31 -0800)]
Merge "Add config_sms_capable."
Svetoslav Ganov [Thu, 9 Dec 2010 22:47:22 +0000 (14:47 -0800)]
Merge "
3205857 java.lang.ExceptionInInitializerError at java.lang.Class.newInstanceImpl(Native Method)"
Alon Albert [Thu, 9 Dec 2010 22:08:27 +0000 (14:08 -0800)]
Merge "Listen for SyncAdapter death to cancel a sync"
Wink Saville [Thu, 9 Dec 2010 22:06:35 +0000 (14:06 -0800)]
am
a7404130: am
d0ffef4b: am
19b23afa: Merge "Fix for phone app crash in Icc Card."
* commit '
a740413022baca3d2bc365ade40f73a1fee46654':
Fix for phone app crash in Icc Card.
Wink Saville [Thu, 9 Dec 2010 22:02:09 +0000 (14:02 -0800)]
am
d0ffef4b: am
19b23afa: Merge "Fix for phone app crash in Icc Card."
* commit '
d0ffef4b43594e540cb867da18d4403b4f583622':
Fix for phone app crash in Icc Card.
Wink Saville [Thu, 9 Dec 2010 21:58:26 +0000 (13:58 -0800)]
am
19b23afa: Merge "Fix for phone app crash in Icc Card."
* commit '
19b23afadf1053a8e06cb3444d9cdae3405ad9a1':
Fix for phone app crash in Icc Card.
Wink Saville [Thu, 9 Dec 2010 21:50:28 +0000 (13:50 -0800)]
Merge "Fix for phone app crash in Icc Card."
Mike Lockwood [Thu, 9 Dec 2010 21:45:34 +0000 (13:45 -0800)]
Merge "CameraBrowser: Give it ACCESS_USB permission, which is now required for PTP"
Eric Laurent [Thu, 9 Dec 2010 21:30:07 +0000 (13:30 -0800)]
Merge "libstagefright: Compile MP3 & AAC decoders in 32bit ARM Mode"
Justin Ho [Thu, 9 Dec 2010 21:29:16 +0000 (13:29 -0800)]
Merge "Adding updated HDPI chat stat_notify icon"
Dianne Hackborn [Thu, 9 Dec 2010 21:16:49 +0000 (13:16 -0800)]
Merge "Fix issue #
3271486: SetupWizward NullPointerException in"
Christopher Tate [Thu, 9 Dec 2010 21:06:46 +0000 (13:06 -0800)]
Merge "Add a couple of transport-descriptive methods to IBackupManager"
John Wang [Thu, 9 Dec 2010 20:53:01 +0000 (12:53 -0800)]
Merge "Add iDEN to getNetworkTypeName."
Jason Sams [Thu, 9 Dec 2010 20:21:19 +0000 (12:21 -0800)]
Merge "Fix a severe cleanup bug where teardown of the GL driver could occur on the wrong thread."
Ben Murdoch [Thu, 9 Dec 2010 19:54:24 +0000 (11:54 -0800)]
Merge "Make audio tag cope with live streams"
Amith Yamasani [Thu, 9 Dec 2010 19:45:32 +0000 (11:45 -0800)]
Merge "Remove the OnItemClick listener when the fragment is destroyed."
Leon Scroggins [Thu, 9 Dec 2010 19:04:06 +0000 (11:04 -0800)]
Merge "Dismiss IME when pressing Next or Previous."
Mindy Pereira [Thu, 9 Dec 2010 18:55:39 +0000 (10:55 -0800)]
Merge "Make sure bottom overscroll feedback takes scrollY into account."
Jean-Baptiste Queru [Thu, 9 Dec 2010 18:48:54 +0000 (10:48 -0800)]
am
1bec55bd: am
d9c17cc1: merge from gingerbread
* commit '
1bec55bd244f72c65fa254118a72ad3ed10aa845':
Add more checks for bad values to protect from corrupt files.
Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService
Jean-Baptiste Queru [Thu, 9 Dec 2010 18:45:29 +0000 (10:45 -0800)]
am
d9c17cc1: merge from gingerbread
* commit '
d9c17cc1178bc09d30eead05bf5be7ec5a05cbe7':
Add more checks for bad values to protect from corrupt files.
Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService
Jean-Baptiste Queru [Thu, 9 Dec 2010 18:18:23 +0000 (10:18 -0800)]
reconcile with open-source gingerbread
Change-Id: I11029c58c7bcfa194dde5584ea1e3ba048fb817b
Andy Stadler [Thu, 9 Dec 2010 18:05:27 +0000 (10:05 -0800)]
Merge "API CHANGE - Add hasGrantedPolicy() API"
Dianne Hackborn [Thu, 9 Dec 2010 17:28:26 +0000 (09:28 -0800)]
Merge "Fix not saving state when restarting an activity."
Jean-Baptiste Queru [Thu, 9 Dec 2010 17:11:06 +0000 (09:11 -0800)]
merge from gingerbread
Change-Id: I12d6ef65986db41e658bf8d476a8e18c4dd89917
Mike Lockwood [Thu, 9 Dec 2010 16:42:56 +0000 (08:42 -0800)]
Merge "Rehide the PTP content provider interface from the public API."
satok [Thu, 9 Dec 2010 16:10:53 +0000 (08:10 -0800)]
Merge "Change the initial visibility of IME switch button"
Kristian Monsen [Thu, 9 Dec 2010 15:26:01 +0000 (07:26 -0800)]
Merge "Make CookieManager.removeSessionCookies async"
Amith Yamasani [Thu, 9 Dec 2010 12:20:04 +0000 (04:20 -0800)]
Merge "Move the breadcrumbs to the right pane."
Jason Sams [Thu, 9 Dec 2010 07:46:28 +0000 (23:46 -0800)]
Merge "Allocation API update."
Wink Saville [Thu, 9 Dec 2010 06:00:58 +0000 (22:00 -0800)]
am
cc41b92e: am
0a5ae453: am
7f7474dd: Merge "frameworks/base/telephony: Release wakelock on RIL request send error"
* commit '
cc41b92ed7e66cc5d4e14f22b3ea914175d662ec':
frameworks/base/telephony: Release wakelock on RIL request send error
Wink Saville [Thu, 9 Dec 2010 05:57:03 +0000 (21:57 -0800)]
am
0a5ae453: am
7f7474dd: Merge "frameworks/base/telephony: Release wakelock on RIL request send error"
* commit '
0a5ae453e50144b31c7f544714feb5bbc7b77d18':
frameworks/base/telephony: Release wakelock on RIL request send error
Wink Saville [Thu, 9 Dec 2010 05:53:24 +0000 (21:53 -0800)]
am
7f7474dd: Merge "frameworks/base/telephony: Release wakelock on RIL request send error"
* commit '
7f7474ddd6170b68b8b58cc03b75df85c96f08f2':
frameworks/base/telephony: Release wakelock on RIL request send error
Wink Saville [Thu, 9 Dec 2010 05:37:38 +0000 (21:37 -0800)]
Merge "frameworks/base/telephony: Release wakelock on RIL request send error"
Jesse Wilson [Thu, 9 Dec 2010 03:13:34 +0000 (19:13 -0800)]
Merge "Make doclava happy by returning the same type in old and new APIs."
Romain Guy [Thu, 9 Dec 2010 03:10:51 +0000 (19:10 -0800)]
Merge "New, better line drawing implementation. Bug #
3207544 Bug #
3225875"
Iliyan Malchev [Thu, 9 Dec 2010 02:40:43 +0000 (18:40 -0800)]
Merge "service_manager: duplicate registrations override previous ones"
Jeff Brown [Thu, 9 Dec 2010 02:33:05 +0000 (18:33 -0800)]
Merge "Fix a regression in clearMetaKeyState."