OSDN Git Service
Siva Velusamy [Mon, 30 Jan 2012 17:08:27 +0000 (09:08 -0800)]
Merge "gltrace: Use Unix Domain Socket rather than INET Socket"
Chet Haase [Mon, 30 Jan 2012 16:28:18 +0000 (08:28 -0800)]
Merge "Fix bug in LayoutTransition for INVISIBLE views"
Marco Nelissen [Mon, 30 Jan 2012 16:27:57 +0000 (08:27 -0800)]
Merge "Handle adding/removing/renaming nomedia paths"
Mathias Agopian [Mon, 30 Jan 2012 06:40:08 +0000 (22:40 -0800)]
remove unneeded code
Change-Id: I07e2fca7274d2e12bf5b4aee0050794bdb97a8b3
Mathias Agopian [Mon, 30 Jan 2012 06:03:19 +0000 (22:03 -0800)]
Merge "update GLES headers and add support for corresponding new extensions."
Mathias Agopian [Mon, 30 Jan 2012 06:02:36 +0000 (22:02 -0800)]
Merge "added a few more commands to SF's dumpsys"
Mathias Agopian [Mon, 30 Jan 2012 06:01:41 +0000 (22:01 -0800)]
Merge "remove unused code"
Mathias Agopian [Sun, 29 Jan 2012 06:31:55 +0000 (22:31 -0800)]
added a few more commands to SF's dumpsys
--latency-clear [name]
clears the latency data for the specified layer or for
all layers if none is specified
--list
prints the list of all layers regardless of their visibility
Change-Id: I7c07ae020f838c173b98ee50f3fb3e93da78acbb
Mathias Agopian [Sat, 28 Jan 2012 22:20:59 +0000 (14:20 -0800)]
update GLES headers and add support for corresponding new extensions.
Change-Id: I554d9659113b4721b748ee5c1a3b1ca82b11d75e
Mathias Agopian [Sun, 29 Jan 2012 02:47:13 +0000 (18:47 -0800)]
remove unused code
Change-Id: If900fcc50f9ffc424e270cb6063b16a2d7bc04d3
Jean-Baptiste Queru [Sat, 28 Jan 2012 05:09:20 +0000 (21:09 -0800)]
am
27d2ab8b: am
dc8668c8: am
97818704: Merge "Wi-Fi: Handle disconnect in middle of DHCP operation"
* commit '
27d2ab8b27e7e1927e18869e898fa556e5da3d43':
Wi-Fi: Handle disconnect in middle of DHCP operation
Roman Nurik [Sat, 28 Jan 2012 05:08:59 +0000 (21:08 -0800)]
am
5525a43a: am
639b25ea: Merge "docs: add NOTICE to action bar icon pack and sprinkle download links" into ics-mr1
* commit '
5525a43a9c814faba22adfafc6517fb64259966f':
docs: add NOTICE to action bar icon pack and sprinkle download links
Roman Nurik [Sat, 28 Jan 2012 05:08:50 +0000 (21:08 -0800)]
am
9d9c7189: am
00b3ceb4: Merge "docs: Update designing-navigation training class to link to Android Design" into ics-mr1
* commit '
9d9c718925e8ec189ba4615f93c2fe8e7d0ab23d':
docs: Update designing-navigation training class to link to Android Design
Jim Miller [Sat, 28 Jan 2012 01:42:26 +0000 (17:42 -0800)]
Merge "Fix
5906830: Update the clock earlier when lock screen comes back from suspend."
Jeff Brown [Sat, 28 Jan 2012 01:37:31 +0000 (17:37 -0800)]
Merge "Improve watchdog monitor for InputReader and InputDispatcher."
Jeff Brown [Sat, 28 Jan 2012 01:37:24 +0000 (17:37 -0800)]
Merge "Implement a cancelation mechanism for queries."
Siva Velusamy [Fri, 27 Jan 2012 22:39:03 +0000 (14:39 -0800)]
gltrace: Use Unix Domain Socket rather than INET Socket
Export trace information via abstract Unix Domain Socket (UDS).
This allows tracing of applications without INTERNET permission,
and should be faster as well.
Change-Id: Iabb67fcc2bc2484afd8128af07dca723b81c52c6
Jean-Michel Trivi [Fri, 27 Jan 2012 22:50:28 +0000 (14:50 -0800)]
Merge "Bug
5567648 Request and abandon audio focus in calls"
Fabrice Di Meglio [Fri, 27 Jan 2012 22:42:06 +0000 (14:42 -0800)]
Merge "Code cleaning: centralize use of #if USE_TEXT_LAYOUT_CACHE"
Jean-Michel Trivi [Fri, 27 Jan 2012 22:15:37 +0000 (14:15 -0800)]
Merge "Bug
5567648 disassociate audio mode and audio focus"
Glenn Kasten [Fri, 27 Jan 2012 22:11:16 +0000 (14:11 -0800)]
Merge "Remove optional LVMX service"
Jean-Baptiste Queru [Fri, 27 Jan 2012 21:58:03 +0000 (13:58 -0800)]
am
dc8668c8: am
97818704: Merge "Wi-Fi: Handle disconnect in middle of DHCP operation"
* commit '
dc8668c8a727a065cbe48c89c900d2fe98e12ab3':
Wi-Fi: Handle disconnect in middle of DHCP operation
Jean-Baptiste Queru [Fri, 27 Jan 2012 21:55:56 +0000 (13:55 -0800)]
am
97818704: Merge "Wi-Fi: Handle disconnect in middle of DHCP operation"
* commit '
9781870491f4f33403f8d518879a88c20180d7cb':
Wi-Fi: Handle disconnect in middle of DHCP operation
Gilles Debunne [Fri, 27 Jan 2012 21:54:50 +0000 (13:54 -0800)]
Merge "Fix for IOOB when suggestions have disappeared"
Gilles Debunne [Fri, 27 Jan 2012 21:54:42 +0000 (13:54 -0800)]
Merge "Handle tap and move cursor before showing suggestions"
Teng-Hui Zhu [Fri, 27 Jan 2012 21:48:25 +0000 (13:48 -0800)]
Merge "Revert "Hack to workaround the fact that the EGL context can be""
Jean-Baptiste Queru [Fri, 27 Jan 2012 21:36:48 +0000 (13:36 -0800)]
Merge "Wi-Fi: Handle disconnect in middle of DHCP operation"
Eric Fischer [Fri, 27 Jan 2012 19:58:58 +0000 (11:58 -0800)]
Merge "Import translations. DO NOT MERGE"
Eric Fischer [Fri, 27 Jan 2012 19:22:52 +0000 (11:22 -0800)]
Merge "Mark locale-neutral configuration strings translatable="false""
Nick Pelly [Fri, 27 Jan 2012 19:03:57 +0000 (11:03 -0800)]
Merge "Fix doc bug."
Nick Pelly [Fri, 27 Jan 2012 18:35:12 +0000 (10:35 -0800)]
Merge "Fix build: update current.txt"
Stephen Hines [Fri, 27 Jan 2012 18:08:18 +0000 (10:08 -0800)]
Merge "Don't wait forever if there are no commands to execute."
Nick Pelly [Fri, 27 Jan 2012 17:59:10 +0000 (09:59 -0800)]
Merge "Add NdefMessage.getByteLength(), and more minor fixes:"
Jamie Gennis [Fri, 27 Jan 2012 17:53:14 +0000 (09:53 -0800)]
Merge "SurfaceTexture: use fence sync on omap4 & s5pc110"
Glenn Kasten [Fri, 27 Jan 2012 17:06:00 +0000 (09:06 -0800)]
Merge "Use audio_source_t consistently"
Glenn Kasten [Fri, 27 Jan 2012 15:22:30 +0000 (07:22 -0800)]
Merge "AudioStreamIn and AudioStreamOut"
Glenn Kasten [Fri, 27 Jan 2012 15:19:53 +0000 (07:19 -0800)]
Merge "Declare methods in binder opcode order"
Glenn Kasten [Fri, 27 Jan 2012 15:19:10 +0000 (07:19 -0800)]
Merge "Use enum effect_state consistently"
Glenn Kasten [Fri, 27 Jan 2012 15:18:23 +0000 (07:18 -0800)]
Merge "Use enum track_state consistently"
Glenn Kasten [Fri, 27 Jan 2012 15:16:46 +0000 (07:16 -0800)]
Merge "Use enum mixer_state consistently"
Alon Albert [Fri, 27 Jan 2012 01:05:58 +0000 (17:05 -0800)]
Merge "Throw NPE if s is null"
Roman Nurik [Fri, 27 Jan 2012 00:35:06 +0000 (16:35 -0800)]
am
639b25ea: Merge "docs: add NOTICE to action bar icon pack and sprinkle download links" into ics-mr1
* commit '
639b25ea289481da6cfd4229649b51ffc6ce3406':
docs: add NOTICE to action bar icon pack and sprinkle download links
Roman Nurik [Fri, 27 Jan 2012 00:32:56 +0000 (16:32 -0800)]
Merge "docs: add NOTICE to action bar icon pack and sprinkle download links" into ics-mr1
Andreas Huber [Fri, 27 Jan 2012 00:00:38 +0000 (16:00 -0800)]
Merge "The software AAC encoder is now an OMX component."
Chet Haase [Thu, 26 Jan 2012 23:53:03 +0000 (15:53 -0800)]
Merge "Fix old issue with compatibility-scaled apps and Animations"
Daniel Sandler [Thu, 26 Jan 2012 23:47:06 +0000 (15:47 -0800)]
am
70828a1d: am
5b08738a: Merge "Suppress mobile-out-of-service label if wifi connected." into ics-mr1
* commit '
70828a1d40c9bf0e5066166216013093298de034':
Suppress mobile-out-of-service label if wifi connected.
Roman Nurik [Thu, 26 Jan 2012 23:35:46 +0000 (15:35 -0800)]
am
00b3ceb4: Merge "docs: Update designing-navigation training class to link to Android Design" into ics-mr1
* commit '
00b3ceb48b5e23daa8101db6080bee46d6518f43':
docs: Update designing-navigation training class to link to Android Design
Roman Nurik [Thu, 26 Jan 2012 23:33:57 +0000 (15:33 -0800)]
Merge "docs: Update designing-navigation training class to link to Android Design" into ics-mr1
Geremy Condra [Thu, 26 Jan 2012 23:06:18 +0000 (15:06 -0800)]
Merge "Removed intent logging from SearchDialog.java"
Jim Miller [Thu, 26 Jan 2012 22:30:49 +0000 (14:30 -0800)]
Merge "Fix
5620754: don't show pattern unlock after SIM unlock if not enabled."
Eric Fischer [Thu, 26 Jan 2012 22:26:10 +0000 (14:26 -0800)]
Merge "Import translations. DO NOT MERGE"
Gilles Debunne [Thu, 26 Jan 2012 22:09:20 +0000 (14:09 -0800)]
Merge "Modified algorithm to remove duplicated suggestions"
Gilles Debunne [Thu, 26 Jan 2012 22:09:00 +0000 (14:09 -0800)]
Merge "Remove @deprecate in View's fadingEdge"
Stephen Hines [Thu, 26 Jan 2012 21:55:57 +0000 (13:55 -0800)]
Merge "Fix bugs with unsigned rsAtomicCas/Max/Min."
Daniel Sandler [Thu, 26 Jan 2012 21:04:17 +0000 (13:04 -0800)]
am
5b08738a: Merge "Suppress mobile-out-of-service label if wifi connected." into ics-mr1
* commit '
5b08738a62ece5bf0ca5d22a6f062e2fb67af272':
Suppress mobile-out-of-service label if wifi connected.
Daniel Sandler [Thu, 26 Jan 2012 21:02:32 +0000 (13:02 -0800)]
Merge "Suppress mobile-out-of-service label if wifi connected." into ics-mr1
Scott Main [Thu, 26 Jan 2012 19:47:35 +0000 (11:47 -0800)]
am
2de74f5f: am
6c055bbd: docs: add action bar icons ZIP
* commit '
2de74f5fa9acc5fae5fc09aad861c13f7162d5cb':
docs: add action bar icons ZIP
Scott Main [Thu, 26 Jan 2012 19:44:58 +0000 (11:44 -0800)]
am
6c055bbd: docs: add action bar icons ZIP
* commit '
6c055bbdf475e6cd324912326c802244b9a76c3b':
docs: add action bar icons ZIP
Ben Cheng [Thu, 26 Jan 2012 19:16:58 +0000 (11:16 -0800)]
Merge "Preserve NEON callee-save registers d8-d15."
Scott Main [Thu, 26 Jan 2012 02:03:20 +0000 (18:03 -0800)]
am
e7ffc5a6: am
9ac4dd82: Merge "docs: remove the 1.0 icon template pack" into ics-mr1
* commit '
e7ffc5a6335c5da24af9e2d6ffde6d6e4b8e5a23':
docs: remove the 1.0 icon template pack
Scott Main [Thu, 26 Jan 2012 02:00:42 +0000 (18:00 -0800)]
am
9ac4dd82: Merge "docs: remove the 1.0 icon template pack" into ics-mr1
* commit '
9ac4dd828065410efbb380992d996c7e93daf437':
docs: remove the 1.0 icon template pack
Scott Main [Thu, 26 Jan 2012 01:58:54 +0000 (17:58 -0800)]
Merge "docs: remove the 1.0 icon template pack" into ics-mr1
Scott Main [Thu, 26 Jan 2012 01:54:48 +0000 (17:54 -0800)]
am
1f9026ca: am
f466db14: Merge "docs: remove ADL presentation PDFs to conserve site space" into ics-mr1
* commit '
1f9026caf1af0f7d3eb9de81641ac290fd340b4b':
docs: remove ADL presentation PDFs to conserve site space
Scott Main [Thu, 26 Jan 2012 01:52:08 +0000 (17:52 -0800)]
am
f466db14: Merge "docs: remove ADL presentation PDFs to conserve site space" into ics-mr1
* commit '
f466db14ec32fbaf08a868df40f7685a7e7df3db':
docs: remove ADL presentation PDFs to conserve site space
Scott Main [Thu, 26 Jan 2012 01:50:20 +0000 (17:50 -0800)]
Merge "docs: remove ADL presentation PDFs to conserve site space" into ics-mr1
Joe Malin [Thu, 26 Jan 2012 01:33:06 +0000 (17:33 -0800)]
am
ba8dd79f: am
9f426604: am
a2a46f62: DOC CHANGE: New Content Provider topics
* commit '
ba8dd79f4eb690fc7922fc4c9b0507d901a2d320':
DOC CHANGE: New Content Provider topics
Joe Malin [Thu, 26 Jan 2012 01:30:13 +0000 (17:30 -0800)]
am
9f426604: am
a2a46f62: DOC CHANGE: New Content Provider topics
* commit '
9f426604e6f21e31f8a2194dcff0ea7bf488eee2':
DOC CHANGE: New Content Provider topics
Joe Malin [Thu, 26 Jan 2012 01:27:46 +0000 (17:27 -0800)]
am
a2a46f62: DOC CHANGE: New Content Provider topics
* commit '
a2a46f629446af0935e8ebbbd7cdb55e395f79f3':
DOC CHANGE: New Content Provider topics
Svetoslav Ganov [Thu, 26 Jan 2012 01:09:54 +0000 (17:09 -0800)]
Merge "Fixing failing focus tests"
Teng-Hui Zhu [Thu, 26 Jan 2012 00:53:05 +0000 (16:53 -0800)]
Merge "Make sure WebView get notified before the EGL context destroyed."
Dianne Hackborn [Thu, 26 Jan 2012 00:15:43 +0000 (16:15 -0800)]
Merge "Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc."
Dianne Hackborn [Wed, 25 Jan 2012 23:12:23 +0000 (15:12 -0800)]
Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
Change-Id: I519d6cdc527a402d93b98df17a64fc1da52ad598
Gilles Debunne [Wed, 25 Jan 2012 23:08:29 +0000 (15:08 -0800)]
Merge "Unbalanced batch edit begin and end leave TextView unresponsive"
Fabrice Di Meglio [Wed, 25 Jan 2012 22:52:40 +0000 (14:52 -0800)]
Merge "Update Javadoc for InputConnection.deleteSurroundingText()"
Gilles Debunne [Wed, 25 Jan 2012 22:07:08 +0000 (14:07 -0800)]
Merge "TextView's display list updated on layout"
Wink Saville [Wed, 25 Jan 2012 22:04:59 +0000 (14:04 -0800)]
Merge "Add additional debug"
Wink Saville [Wed, 25 Jan 2012 21:45:02 +0000 (13:45 -0800)]
Merge "Fix ClassCastException"
Nick Pelly [Wed, 25 Jan 2012 20:55:58 +0000 (12:55 -0800)]
Merge "Add API's for normalizing MIME's and URI's."
Dianne Hackborn [Wed, 25 Jan 2012 20:29:17 +0000 (12:29 -0800)]
Merge "Added JELLY_BEAN version name; update some targetSdkVersion docs."
Jeff Brown [Wed, 25 Jan 2012 19:52:48 +0000 (11:52 -0800)]
Merge "Fix an inconsistent comment."
Robert Greenwalt [Wed, 25 Jan 2012 19:33:14 +0000 (11:33 -0800)]
am
10953351: am
44f64c96: Merge "Filter our v6 address from tethering dns." into ics-mr1
* commit '
109533519153307b10e2b3ae327ca4b4cd0c75d3':
Filter our v6 address from tethering dns.
Robert Greenwalt [Wed, 25 Jan 2012 19:30:39 +0000 (11:30 -0800)]
am
44f64c96: Merge "Filter our v6 address from tethering dns." into ics-mr1
* commit '
44f64c965776ae65ff85ef8c37afb7e14483bdf2':
Filter our v6 address from tethering dns.
Robert Greenwalt [Wed, 25 Jan 2012 19:28:30 +0000 (11:28 -0800)]
Merge "Filter our v6 address from tethering dns." into ics-mr1
Jean-Baptiste Queru [Wed, 25 Jan 2012 18:33:42 +0000 (10:33 -0800)]
am
95306d85: am
64085d03: am
12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit platforms"
* commit '
95306d85005f165e10a25ad45cadadec6e1f6a31':
stagefright aacenc: Fix type definitions for 64 bit platforms
Jean-Baptiste Queru [Wed, 25 Jan 2012 18:30:31 +0000 (10:30 -0800)]
am
64085d03: am
12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit platforms"
* commit '
64085d03efcd2abf3b8cd64f4e6344a1ece014c3':
stagefright aacenc: Fix type definitions for 64 bit platforms
Jean-Baptiste Queru [Wed, 25 Jan 2012 18:27:41 +0000 (10:27 -0800)]
am
12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit platforms"
* commit '
12045502c49bfee40d7d3cb806d9b70d3b5d3ed3':
stagefright aacenc: Fix type definitions for 64 bit platforms
Jean-Michel Trivi [Wed, 25 Jan 2012 17:46:01 +0000 (09:46 -0800)]
Merge "Update AudioTrack.stop() javadoc"
Jean-Baptiste Queru [Wed, 25 Jan 2012 17:17:45 +0000 (09:17 -0800)]
Merge "stagefright aacenc: Fix type definitions for 64 bit platforms"
Roman Nurik [Wed, 25 Jan 2012 16:57:45 +0000 (08:57 -0800)]
am
92aaf243: am
cf077fdd: Merge "docs: Android Design typo and grammar fixes" into ics-mr1
* commit '
92aaf2431ccb8d5ef1eb456646742c736fa70266':
docs: Android Design typo and grammar fixes
Jean-Baptiste Queru [Wed, 25 Jan 2012 16:57:36 +0000 (08:57 -0800)]
am
e2594b85: am
4cd2b343: am
98539a4e: Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe"
* commit '
e2594b85093441e03150c7cfc540abc626884eaf':
stagefright amrwbenc: Make the mem_malloc function 64-bit safe
Jean-Baptiste Queru [Wed, 25 Jan 2012 16:57:32 +0000 (08:57 -0800)]
am
a3946104: am
fc2ea24b: am
d80cbb8c: Merge "stagefright aacenc: Add missing newlines at the end of files"
* commit '
a39461047eae6022e2c0ef873ffa2c7241b393a9':
stagefright aacenc: Add missing newlines at the end of files
Daniel Sandler [Wed, 25 Jan 2012 16:57:27 +0000 (08:57 -0800)]
am
416a1c1a: am
185c0ef7: Merge "Stop showing "No internet connection" when there is one." into ics-mr1
* commit '
416a1c1ada0ad553613eb439823a68d3f51b1579':
Stop showing "No internet connection" when there is one.
Eric Laurent [Wed, 25 Jan 2012 16:57:23 +0000 (08:57 -0800)]
am
535b0264: am
7eeaf3f0: Merge "AudioFlinger: refine mixer sleep time logic" into ics-mr1
* commit '
535b0264a4cfa790e549bd9cd09980788f1375f4':
AudioFlinger: refine mixer sleep time logic
Eric Laurent [Wed, 25 Jan 2012 16:57:20 +0000 (08:57 -0800)]
am
dd347d51: (-s ours) am
41773d46: Merge "DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""" into ics-mr1
* commit '
dd347d515d4a4e42b2aba89a8e471392026b7824':
DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""
Robert Greenwalt [Wed, 25 Jan 2012 16:54:59 +0000 (08:54 -0800)]
Merge "resolved conflicts for merge of
67cda1a0 to master"
George Mount [Wed, 25 Jan 2012 15:37:30 +0000 (07:37 -0800)]
Merge "Fix auto-complete for content-editable fields."
Mathias Agopian [Wed, 25 Jan 2012 03:22:08 +0000 (19:22 -0800)]
Merge changes Ib6b6da1d,I6d9a466a
* changes:
improve SurfaceFlinger dumpsys
hack up frame latency measurement
Mathias Agopian [Fri, 20 Jan 2012 02:34:40 +0000 (18:34 -0800)]
improve SurfaceFlinger dumpsys
It is now possible to say:
dumpsys SurfaceFlinger --latency
to print latency information about all windows
dumpsys SurfaceFlinger --latency window-name
to print the latency stats of the specified window
for instance: dumpsys SurfaceFlinger --latency SurfaceView
The data consists of one line containing global stats, followed by
128 lines of tab separated timestamps in nanosecond.
The first line currently contains the refresh period in nanosecond.
Each 128 following line contains 3 timestamps, of respectively
the app draw time, the vsync timestamp just prior the call to set and
the timestamp of the call to set.
Change-Id: Ib6b6da1d7e2e6ba49c282bdbc0b56a7dc203343a
Roman Nurik [Wed, 25 Jan 2012 02:11:12 +0000 (18:11 -0800)]
am
cf077fdd: Merge "docs: Android Design typo and grammar fixes" into ics-mr1
* commit '
cf077fdd79853dd4778598a623dc2f469c1a8934':
docs: Android Design typo and grammar fixes
Roman Nurik [Wed, 25 Jan 2012 02:08:52 +0000 (18:08 -0800)]
Merge "docs: Android Design typo and grammar fixes" into ics-mr1