OSDN Git Service
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"
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.
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
Jim Miller [Wed, 25 Jan 2012 01:41:04 +0000 (17:41 -0800)]
Merge "Fix
5907237: dismiss keyguard after the camera app launches."
Svetoslav Ganov [Wed, 25 Jan 2012 01:02:23 +0000 (17:02 -0800)]
Merge "Fixing a typo in the NumberPicker documentation."
Fabrice Di Meglio [Wed, 25 Jan 2012 00:57:21 +0000 (16:57 -0800)]
Merge "Fix bug #
5901103 all_source_project_146981_Android - Android ICS LQA Regression:FA, AR, HE and TH - Font Corruption"
Jean-Michel Trivi [Wed, 25 Jan 2012 00:23:22 +0000 (16:23 -0800)]
Merge "More AudioManager tests"
Winson Chung [Tue, 24 Jan 2012 23:51:53 +0000 (15:51 -0800)]
Merge "Call ActivityManager to get the proper icon dpi."
Jamie Gennis [Mon, 16 Jan 2012 02:54:57 +0000 (18:54 -0800)]
hack up frame latency measurement
Change-Id: I6d9a466a23285304f0e229a5649815636ab5d6af
Jeff Sharkey [Tue, 24 Jan 2012 23:38:54 +0000 (15:38 -0800)]
Merge "Match WIFI_P2P data usage."
Svetoslav Ganov [Tue, 24 Jan 2012 23:27:12 +0000 (15:27 -0800)]
Merge "NumberPicker should not throw an exception if no enough values for wrapping."
Jean-Baptiste Queru [Tue, 24 Jan 2012 23:15:36 +0000 (15:15 -0800)]
am
4cd2b343: am
98539a4e: Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe"
* commit '
4cd2b343272429adae1fc68e0ec0628c69e88e6d':
stagefright amrwbenc: Make the mem_malloc function 64-bit safe
Jean-Baptiste Queru [Tue, 24 Jan 2012 23:15:33 +0000 (15:15 -0800)]
am
fc2ea24b: am
d80cbb8c: Merge "stagefright aacenc: Add missing newlines at the end of files"
* commit '
fc2ea24b024f7a015d67054adb7bb09ff3a0a97b':
stagefright aacenc: Add missing newlines at the end of files
Jean-Baptiste Queru [Tue, 24 Jan 2012 23:13:45 +0000 (15:13 -0800)]
am
98539a4e: Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe"
* commit '
98539a4eba7677c0b1ddc12f800c7075851ef302':
stagefright amrwbenc: Make the mem_malloc function 64-bit safe
Jean-Baptiste Queru [Tue, 24 Jan 2012 23:13:42 +0000 (15:13 -0800)]
am
d80cbb8c: Merge "stagefright aacenc: Add missing newlines at the end of files"
* commit '
d80cbb8c7b13203704c00e2f5941588811c15665':
stagefright aacenc: Add missing newlines at the end of files
Robert Greenwalt [Tue, 24 Jan 2012 23:02:06 +0000 (15:02 -0800)]
resolved conflicts for merge of
67cda1a0 to master
Change-Id: I5ea4398b209faa381f1c50ed6d51fed06d245af1
Jean-Baptiste Queru [Tue, 24 Jan 2012 22:26:30 +0000 (14:26 -0800)]
Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe"
Chris Craik [Tue, 24 Jan 2012 22:15:25 +0000 (14:15 -0800)]
Merge "Allow profiling of animation performance"
Adam Powell [Tue, 24 Jan 2012 21:58:41 +0000 (13:58 -0800)]
Merge "Update ShareActionProvider to clear the sharing activity when the task is reset."
Svetoslav Ganov [Tue, 24 Jan 2012 21:57:05 +0000 (13:57 -0800)]
Merge "Removing unused imports and swiching off deprecated APIs"
Daniel Sandler [Tue, 24 Jan 2012 20:57:14 +0000 (12:57 -0800)]
am
185c0ef7: Merge "Stop showing "No internet connection" when there is one." into ics-mr1
* commit '
185c0ef7e4aaa4bb978a6eb5c93c569585a07f56':
Stop showing "No internet connection" when there is one.
Daniel Sandler [Tue, 24 Jan 2012 20:54:48 +0000 (12:54 -0800)]
Merge "Stop showing "No internet connection" when there is one." into ics-mr1
Eric Laurent [Tue, 24 Jan 2012 19:51:50 +0000 (11:51 -0800)]
am
7eeaf3f0: Merge "AudioFlinger: refine mixer sleep time logic" into ics-mr1
* commit '
7eeaf3f07aa6fb10639d9f96c1367eb98c3e8839':
AudioFlinger: refine mixer sleep time logic
Eric Laurent [Tue, 24 Jan 2012 19:51:47 +0000 (11:51 -0800)]
am
41773d46: Merge "DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""" into ics-mr1
* commit '
41773d46556aa47d4322ff89fdaf7d1345c2d1f2':
DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""
Jeff Sharkey [Tue, 24 Jan 2012 19:49:51 +0000 (11:49 -0800)]
Merge "Move network stats to FileRotator pattern."
Eric Laurent [Tue, 24 Jan 2012 19:49:39 +0000 (11:49 -0800)]
Merge "AudioFlinger: refine mixer sleep time logic" into ics-mr1
Eric Laurent [Tue, 24 Jan 2012 19:49:16 +0000 (11:49 -0800)]
Merge "DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""" into ics-mr1
Robert Greenwalt [Tue, 24 Jan 2012 19:42:21 +0000 (11:42 -0800)]
am
f449ea9e: Merge "Use the carrier-given dns addrs for tethering." into ics-mr1
* commit '
f449ea9e96162698f4ec6d62c70750eb50744da7':
Use the carrier-given dns addrs for tethering.
Robert Greenwalt [Tue, 24 Jan 2012 19:40:19 +0000 (11:40 -0800)]
Merge "Use the carrier-given dns addrs for tethering." into ics-mr1
Dianne Hackborn [Tue, 24 Jan 2012 19:39:49 +0000 (11:39 -0800)]
am
a5853595: am
47163685: Merge "Another attempt at issue #
5823276: home repaints after full-screen app is exited" into ics-mr1
* commit '
a5853595165a6395ca41bbc17a3dd88e12259ad1':
Another attempt at issue #
5823276: home repaints after full-screen app is exited
Dianne Hackborn [Tue, 24 Jan 2012 19:37:24 +0000 (11:37 -0800)]
am
29cd79c7: am
c986d6f0: Merge "Fix issue #
5906017: Missing menu entries in portrait when in compatibility mode" into ics-mr1
* commit '
29cd79c7b0fecd2753fc27405794c0d5b5314302':
Fix issue #
5906017: Missing menu entries in portrait when in compatibility mode
Daniel Sandler [Tue, 24 Jan 2012 19:37:21 +0000 (11:37 -0800)]
am
9dc211af: am
a4474ae0: Merge "Detect and repair invalid layouts in the navigation bar." into ics-mr1
* commit '
9dc211afbf3201a23a29cf7cd02ce575c6dbe094':
Detect and repair invalid layouts in the navigation bar.
Dianne Hackborn [Tue, 24 Jan 2012 19:37:02 +0000 (11:37 -0800)]
am
47163685: Merge "Another attempt at issue #
5823276: home repaints after full-screen app is exited" into ics-mr1
* commit '
47163685eb90f9520e7ae0ac0984b4e1535e8e5b':
Another attempt at issue #
5823276: home repaints after full-screen app is exited
Dianne Hackborn [Tue, 24 Jan 2012 19:34:49 +0000 (11:34 -0800)]
am
c986d6f0: Merge "Fix issue #
5906017: Missing menu entries in portrait when in compatibility mode" into ics-mr1
* commit '
c986d6f01b00dd760ba1650918baadd24a6dc838':
Fix issue #
5906017: Missing menu entries in portrait when in compatibility mode
Daniel Sandler [Tue, 24 Jan 2012 19:34:47 +0000 (11:34 -0800)]
am
a4474ae0: Merge "Detect and repair invalid layouts in the navigation bar." into ics-mr1
* commit '
a4474ae02546d725686f9c08113c16a84aca912c':
Detect and repair invalid layouts in the navigation bar.
Dianne Hackborn [Tue, 24 Jan 2012 19:33:15 +0000 (11:33 -0800)]
Merge "Another attempt at issue #
5823276: home repaints after full-screen app is exited" into ics-mr1
Dianne Hackborn [Tue, 24 Jan 2012 19:33:06 +0000 (11:33 -0800)]
Merge "Fix issue #
5906017: Missing menu entries in portrait when in compatibility mode" into ics-mr1