OSDN Git Service
Romain Guy [Fri, 21 Oct 2011 03:33:51 +0000 (20:33 -0700)]
Merge "Make sure 9patches are not filtered when not necessary Bug #
5383406"
Fabrice Di Meglio [Fri, 21 Oct 2011 01:58:03 +0000 (18:58 -0700)]
Merge "Fix compilation issue when DEBUG_GLYPHS define is activated"
Mathias Agopian [Fri, 21 Oct 2011 00:48:02 +0000 (17:48 -0700)]
am
16bece04: Merge "added dpi and refresh rate info in SF\'s dumpsys" into ics-mr0
* commit '
16bece04bdbac9af5228436f70267ec5763315de':
added dpi and refresh rate info in SF's dumpsys
Mathias Agopian [Fri, 21 Oct 2011 00:45:55 +0000 (17:45 -0700)]
Merge "added dpi and refresh rate info in SF's dumpsys" into ics-mr0
Jim Miller [Fri, 21 Oct 2011 00:35:51 +0000 (17:35 -0700)]
am
6b024448: Merge "Fix
5493266: Properly restore background after playing music" into ics-mr0
* commit '
6b0244485c1d20261cffb0fbabebdfefd701867e':
Fix
5493266: Properly restore background after playing music
Jim Miller [Fri, 21 Oct 2011 00:33:42 +0000 (17:33 -0700)]
Merge "Fix
5493266: Properly restore background after playing music" into ics-mr0
Mathias Agopian [Fri, 21 Oct 2011 00:22:38 +0000 (17:22 -0700)]
added dpi and refresh rate info in SF's dumpsys
Change-Id: I2327248eb1993689367e3daeaccba74c172dfceb
Jake Hamby [Thu, 20 Oct 2011 23:55:48 +0000 (16:55 -0700)]
Merge "Add new RIL requests to support SIM data download via SMS over IMS."
Adam Powell [Thu, 20 Oct 2011 23:26:56 +0000 (16:26 -0700)]
am
a5c371bf: Merge "Bug
5275928 - Invasion of the monkeys" into ics-mr0
* commit '
a5c371bf1fc878f84c296a63839a5d031dea843f':
Bug
5275928 - Invasion of the monkeys
Adam Powell [Thu, 20 Oct 2011 23:25:04 +0000 (16:25 -0700)]
Merge "Bug
5275928 - Invasion of the monkeys" into ics-mr0
Iliyan Malchev [Thu, 20 Oct 2011 05:35:56 +0000 (22:35 -0700)]
add -ldl to host executables
This fixes the build on Linux when RefBase is compiled with reference tracking
enabled.
Change-Id: I3e931e0b463ce836f6fdb30c37068d77144631a3
Signed-off-by: Iliyan Malchev <malchev@google.com>
Michael Chan [Thu, 20 Oct 2011 22:42:30 +0000 (15:42 -0700)]
Merge "Fix typos"
Gilles Debunne [Thu, 20 Oct 2011 22:35:34 +0000 (15:35 -0700)]
Merge "Renaming of a hidden API: ShowSoftInputOnFocus"
Gilles Debunne [Thu, 20 Oct 2011 22:35:20 +0000 (15:35 -0700)]
Merge "Typo in ViewRootImpl"
Gilles Debunne [Thu, 20 Oct 2011 22:35:12 +0000 (15:35 -0700)]
Merge "Wrong word cut at end of lines with spaces"
Irfan Sheriff [Thu, 20 Oct 2011 22:07:46 +0000 (15:07 -0700)]
am
2159927f: Merge "Fix handling in DisconnectingState" into ics-mr0
* commit '
2159927f366fd8a617128df60865923e131cad7b':
Fix handling in DisconnectingState
Irfan Sheriff [Thu, 20 Oct 2011 22:05:07 +0000 (15:05 -0700)]
Merge "Fix handling in DisconnectingState" into ics-mr0
Dirk Dougherty [Thu, 20 Oct 2011 21:34:50 +0000 (14:34 -0700)]
am
957ad44e: Merge "Doc change: minor fixes to ICS highlights." into ics-mr0
* commit '
957ad44e9c6f1415dae85a0177d37c3a69f1e955':
Doc change: minor fixes to ICS highlights.
Dirk Dougherty [Thu, 20 Oct 2011 21:32:19 +0000 (14:32 -0700)]
Merge "Doc change: minor fixes to ICS highlights." into ics-mr0
Svetoslav Ganov [Thu, 20 Oct 2011 21:29:18 +0000 (14:29 -0700)]
Merge "Add content description setter to RemoteViews"
Jason Sams [Thu, 20 Oct 2011 20:54:37 +0000 (13:54 -0700)]
Merge "adding getters to Sampler ProgramRaster, ProgramStore, Element. Element adds ability to get subelement info. Tests for new stuff."
Jason Sams [Thu, 20 Oct 2011 20:52:43 +0000 (13:52 -0700)]
Merge "Remove ObjBaseRef from the hal struct"
Jason Sams [Thu, 20 Oct 2011 20:49:59 +0000 (13:49 -0700)]
Merge "Fixes and optimizations of two quaternion functions."
Christopher Tate [Thu, 20 Oct 2011 20:21:07 +0000 (13:21 -0700)]
Merge "Don't inappropriately kill ANRing drop recipients"
Daniel Sandler [Thu, 20 Oct 2011 20:11:15 +0000 (13:11 -0700)]
am
d2cd1f72: Merge "Lazily fetch the status bar service." into ics-mr0
* commit '
d2cd1f722421c33e88df92d036663f30b316fa3f':
Lazily fetch the status bar service.
Daniel Sandler [Thu, 20 Oct 2011 20:08:36 +0000 (13:08 -0700)]
Merge "Lazily fetch the status bar service." into ics-mr0
Scott Main [Thu, 20 Oct 2011 20:05:38 +0000 (13:05 -0700)]
am
b321cd99: docs: fix tools release notes links
* commit '
b321cd99c24272494bb9af5662c18c5bdc507186':
docs: fix tools release notes links
Eric Fischer [Thu, 20 Oct 2011 18:29:19 +0000 (11:29 -0700)]
am
7ec4284a: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '
7ec4284ab2026a82e6904a4974db8f947c159960':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 20 Oct 2011 18:25:44 +0000 (11:25 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
Michael Chan [Thu, 20 Oct 2011 17:51:58 +0000 (10:51 -0700)]
Merge "Update comments for Calendar ExtendedProperties."
Daniel Sandler [Thu, 20 Oct 2011 17:50:54 +0000 (10:50 -0700)]
am
0d6ff010: Tune wifi RSSI code (see bug
5241139).
* commit '
0d6ff01050af1bc37ee383c9c7ed1b3a3aa775bf':
Tune wifi RSSI code (see bug
5241139).
The Android Open Source Project [Thu, 20 Oct 2011 16:17:09 +0000 (09:17 -0700)]
Reconcile with ics-mr0-release
Change-Id: I21c521bc9659ba52a8a48a9f142befa418e0896c
Jesse Hall [Thu, 20 Oct 2011 16:09:31 +0000 (09:09 -0700)]
Merge "SurfaceTexture: add tests for buffer leaks"
satok [Thu, 20 Oct 2011 15:44:39 +0000 (08:44 -0700)]
am
1301f092: Merge "Update links for SampleSpellCheckerService for I938ba499" into ics-mr0
* commit '
1301f092e5bd520821c54c788a07cbdfda49df7b':
Update links for SampleSpellCheckerService for I938ba499
satok [Thu, 20 Oct 2011 15:42:50 +0000 (08:42 -0700)]
Merge "Update links for SampleSpellCheckerService for I938ba499" into ics-mr0
Justin Ho [Thu, 20 Oct 2011 14:29:31 +0000 (07:29 -0700)]
am
9397f580: Merge "Add louder keypress sounds for different device configurations" into ics-mr0
* commit '
9397f5807b5377c5edef99820614694cc7e05160':
Add louder keypress sounds for different device configurations
Justin Ho [Thu, 20 Oct 2011 14:25:14 +0000 (07:25 -0700)]
Merge "Add louder keypress sounds for different device configurations" into ics-mr0
The Android Automerger [Thu, 20 Oct 2011 13:28:24 +0000 (06:28 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
Jean Chalard [Thu, 20 Oct 2011 12:36:26 +0000 (05:36 -0700)]
Merge "Fix a warning from the binder, step 2."
Jean Chalard [Thu, 20 Oct 2011 12:26:29 +0000 (05:26 -0700)]
Merge "Fix a warning from the binder, step 3."
Dave Burke [Thu, 20 Oct 2011 05:38:45 +0000 (22:38 -0700)]
am
23d64420: Merge "Stagefright: idle OMX after ANW errors" into ics-mr0
* commit '
23d644202a44383bf008ff86f6faa3ea7e447290':
Stagefright: idle OMX after ANW errors
Dave Burke [Thu, 20 Oct 2011 05:37:18 +0000 (22:37 -0700)]
Merge "Stagefright: idle OMX after ANW errors" into ics-mr0
Winson Chung [Thu, 20 Oct 2011 04:39:31 +0000 (21:39 -0700)]
am
44630c72: Merge "Updating the screenshot notification icons." into ics-mr0
* commit '
44630c72651803ba1dedba3b5352cad8a8a62ace':
Updating the screenshot notification icons.
Winson Chung [Thu, 20 Oct 2011 04:36:32 +0000 (21:36 -0700)]
Merge "Updating the screenshot notification icons." into ics-mr0
Svetoslav Ganov [Thu, 20 Oct 2011 04:17:14 +0000 (21:17 -0700)]
am
5dc30a77: Merge "DatePicker crashes when going from 2036 to 2035 via ▼" into ics-mr0
* commit '
5dc30a770ab1b4f07ff10502f9de9ec39daac41d':
DatePicker crashes when going from 2036 to 2035 via ▼
Svetoslav Ganov [Thu, 20 Oct 2011 04:15:30 +0000 (21:15 -0700)]
Merge "DatePicker crashes when going from 2036 to 2035 via ▼" into ics-mr0
Jim Miller [Thu, 20 Oct 2011 03:50:45 +0000 (20:50 -0700)]
am
2f35281a: Merge "Fix
5485925: Fix crash in transport control view" into ics-mr0
* commit '
2f35281ae0ae4471527e9286f022cb960384044e':
Fix
5485925: Fix crash in transport control view
Jim Miller [Thu, 20 Oct 2011 03:49:33 +0000 (20:49 -0700)]
Merge "Fix
5485925: Fix crash in transport control view" into ics-mr0
Chih-Chung Chang [Thu, 20 Oct 2011 03:09:13 +0000 (20:09 -0700)]
am
f806871f: Fix
5487571: Make sure shutter sound is played when it\'s enforced
* commit '
f806871f3016a8184de4c9dcfbe0b9069dc0d72c':
Fix
5487571: Make sure shutter sound is played when it's enforced
The Android Automerger [Thu, 20 Oct 2011 02:01:02 +0000 (19:01 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
Maarten Hooft [Thu, 20 Oct 2011 01:23:20 +0000 (18:23 -0700)]
am
d47d4f7b: Merge "Add a delay before walled garden test" into ics-mr0
* commit '
d47d4f7b7713a4a05da7ea55c3e698b939fe81b1':
Add a delay before walled garden test
Maarten Hooft [Thu, 20 Oct 2011 01:21:56 +0000 (18:21 -0700)]
Merge "Add a delay before walled garden test" into ics-mr0
Svetoslav Ganov [Thu, 20 Oct 2011 01:18:44 +0000 (18:18 -0700)]
am
06044fe1: Merge "AccessibilityServiceInfo does not report properly the feedback type." into ics-mr0
* commit '
06044fe114f7f07c15b0ba92740829cb8896766b':
AccessibilityServiceInfo does not report properly the feedback type.
Svetoslav Ganov [Thu, 20 Oct 2011 01:15:52 +0000 (18:15 -0700)]
Merge "AccessibilityServiceInfo does not report properly the feedback type." into ics-mr0
Daniel Sandler [Thu, 20 Oct 2011 01:07:18 +0000 (18:07 -0700)]
am
84e825a8: Merge "Add hasNavigationBar() to the window manager." into ics-mr0
* commit '
84e825a84d7dde03042228c79638935c92d13c92':
Add hasNavigationBar() to the window manager.
Dirk Dougherty [Thu, 20 Oct 2011 01:07:16 +0000 (18:07 -0700)]
am
62ade220: Merge "Doc change: add video to platform highlights and fix a few things." into ics-mr0
* commit '
62ade220d9b72a9edc8fcc4dfe98ca9541c6d501':
Doc change: add video to platform highlights and fix a few things.
Daniel Sandler [Thu, 20 Oct 2011 01:05:20 +0000 (18:05 -0700)]
Merge "Add hasNavigationBar() to the window manager." into ics-mr0
Dirk Dougherty [Thu, 20 Oct 2011 01:05:18 +0000 (18:05 -0700)]
Merge "Doc change: add video to platform highlights and fix a few things." into ics-mr0
James Dong [Thu, 20 Oct 2011 00:57:58 +0000 (17:57 -0700)]
am
b3cdadb6: Merge "Check whether media recorder client exists before dumping." into ics-mr0
* commit '
b3cdadb639027f62c7c1637ca962a70d2d1f3b4d':
Check whether media recorder client exists before dumping.
James Dong [Thu, 20 Oct 2011 00:55:45 +0000 (17:55 -0700)]
Merge "Check whether media recorder client exists before dumping." into ics-mr0
Dianne Hackborn [Thu, 20 Oct 2011 00:17:29 +0000 (17:17 -0700)]
am
16362041: Merge "Fix issue #
5484096: Device rebooted after turning WiFi tethering ON, IRL19 Crespo." into ics-mr0
* commit '
163620417bc2980528e2079e3456c9600a92e165':
Fix issue #
5484096: Device rebooted after turning WiFi tethering ON, IRL19 Crespo.
Dianne Hackborn [Thu, 20 Oct 2011 00:15:39 +0000 (17:15 -0700)]
Merge "Fix issue #
5484096: Device rebooted after turning WiFi tethering ON, IRL19 Crespo." into ics-mr0
Romain Guy [Thu, 20 Oct 2011 00:07:25 +0000 (17:07 -0700)]
Merge "Correctly dump DrawPatch operations in display lists"
Peter Ng [Wed, 19 Oct 2011 23:55:54 +0000 (16:55 -0700)]
Merge "Fixing blurry textfields"
Wink Saville [Wed, 19 Oct 2011 23:27:32 +0000 (16:27 -0700)]
Merge "Non-default link should be cleaned up on telephony db change."
Svetoslav Ganov [Wed, 19 Oct 2011 22:53:28 +0000 (15:53 -0700)]
am
018cb119: Merge "AdapterView does not check for null adapter when initializing accessibility event." into ics-mr0
* commit '
018cb119bca7a3a08dd59843e1fec9a3027a8133':
AdapterView does not check for null adapter when initializing accessibility event.
Svetoslav Ganov [Wed, 19 Oct 2011 22:51:18 +0000 (15:51 -0700)]
Merge "AdapterView does not check for null adapter when initializing accessibility event." into ics-mr0
Wink Saville [Wed, 19 Oct 2011 22:43:38 +0000 (15:43 -0700)]
Merge "Do not always say OTASP_NOT_NEEDED for LTE."
Adam Cohen [Wed, 19 Oct 2011 22:31:49 +0000 (15:31 -0700)]
Merge "Manually merging screenshot notification string changes to "
Jamie Gennis [Wed, 19 Oct 2011 22:19:19 +0000 (15:19 -0700)]
SurfaceTexture: add tests for buffer leaks
This change adds two tests to ensure that eglDestroySurface does not
cause Gralloc buffers to be leaked.
Bug:
5472838
Change-Id: Id675d74e34b6479f2d68314d40de94aede69f142
Eric Laurent [Wed, 19 Oct 2011 21:02:10 +0000 (14:02 -0700)]
am
3c86134a: Merge "Fix issue 381905: BassBoostTest CTS tests fail..." into ics-mr0
* commit '
3c86134a50618605c86eb9f5f120dbf97826e3e1':
Fix issue 381905: BassBoostTest CTS tests fail...
Eric Laurent [Wed, 19 Oct 2011 20:59:55 +0000 (13:59 -0700)]
Merge "Fix issue 381905: BassBoostTest CTS tests fail..." into ics-mr0
Scott Main [Wed, 19 Oct 2011 19:25:12 +0000 (12:25 -0700)]
am
bdca5c62: cherrypick from hc-mr2 Change-Id: I20c238ae599db79e41eaa2ea82a1e5631d004967 plus a small tweak to remove "other" data from platform chart docs: dashboard update
* commit '
bdca5c6237558015910a14d38f78ba84973e8ed4':
cherrypick from hc-mr2 Change-Id: I20c238ae599db79e41eaa2ea82a1e5631d004967 plus a small tweak to remove "other" data from platform chart docs: dashboard update
Scott Main [Wed, 19 Oct 2011 19:04:13 +0000 (12:04 -0700)]
am
47bc0fea: docs: fix typo in platform notes issue
5481512
* commit '
47bc0feace5b842b3b8bf07b88e41ff658667bb3':
docs: fix typo in platform notes issue
5481512
Daniel Sandler [Wed, 19 Oct 2011 19:00:13 +0000 (12:00 -0700)]
am
2f6a5327: Merge "Auto-close if you swipe away the last notification." into ics-mr0
* commit '
2f6a53270f113a244f3b6ca91a1efef2c4a26fac':
Auto-close if you swipe away the last notification.
Daniel Sandler [Wed, 19 Oct 2011 18:58:27 +0000 (11:58 -0700)]
Merge "Auto-close if you swipe away the last notification." into ics-mr0
Dianne Hackborn [Wed, 19 Oct 2011 18:10:18 +0000 (11:10 -0700)]
am
47f8367a: Merge "Work on issue #
5465917: Wakelock *overflow* held for very long times" into ics-mr0
* commit '
47f8367ab79247501d5d204632a7797fa8a888e5':
Work on issue #
5465917: Wakelock *overflow* held for very long times
Jamie Gennis [Wed, 19 Oct 2011 18:08:11 +0000 (11:08 -0700)]
am
827d069a: Merge "SurfaceTexture: free buffers when disconnect fails" into ics-mr0
* commit '
827d069afb297b6d96c995c03da9d4ee17e60679':
SurfaceTexture: free buffers when disconnect fails
Dianne Hackborn [Wed, 19 Oct 2011 18:07:34 +0000 (11:07 -0700)]
Merge "Work on issue #
5465917: Wakelock *overflow* held for very long times" into ics-mr0
Jamie Gennis [Wed, 19 Oct 2011 18:06:05 +0000 (11:06 -0700)]
Merge "SurfaceTexture: free buffers when disconnect fails" into ics-mr0
Michael Jurka [Wed, 19 Oct 2011 17:31:47 +0000 (10:31 -0700)]
am
9a76afff: Merge "Make Recent Apps faster" into ics-mr0
* commit '
9a76afff4da4bd51685b0938439c4f4a0e19345f':
Make Recent Apps faster
Ben Komalo [Wed, 19 Oct 2011 17:31:42 +0000 (10:31 -0700)]
am
8408e516: Merge "Fix remote device wipe to not hang." into ics-mr0
* commit '
8408e5165a74ddee7d2d8698314cfda521fbfc76':
Fix remote device wipe to not hang.
Michael Jurka [Wed, 19 Oct 2011 17:04:19 +0000 (10:04 -0700)]
Merge "Make Recent Apps faster" into ics-mr0
Ben Komalo [Wed, 19 Oct 2011 16:32:50 +0000 (09:32 -0700)]
Merge "Fix remote device wipe to not hang." into ics-mr0
Marco Nelissen [Wed, 19 Oct 2011 14:50:24 +0000 (07:50 -0700)]
Merge "Refactor FileInserter in MediaScanner and adding unit tests for the newly added class."
The Android Open Source Project [Wed, 19 Oct 2011 14:23:01 +0000 (07:23 -0700)]
Reconcile with ics-mr0-release
Change-Id: Ie6705bfff564fe89f151753a034decc60f02b03b
The Android Automerger [Wed, 19 Oct 2011 13:28:30 +0000 (06:28 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
Dave Burke [Wed, 19 Oct 2011 06:00:08 +0000 (23:00 -0700)]
am
70ac412b: Merge "Add a LayerScreenshot" into ics-mr0
* commit '
70ac412b2fe7be2507189a9fdfb30c43b36d56ac':
Add a LayerScreenshot
Dave Burke [Wed, 19 Oct 2011 05:58:09 +0000 (22:58 -0700)]
Merge "Add a LayerScreenshot" into ics-mr0
Dave Burke [Wed, 19 Oct 2011 05:34:51 +0000 (22:34 -0700)]
am
d7035c58: Merge "Fix a hang in SF caused by invalid transform matrix from the WM" into ics-mr0
* commit '
d7035c58b006b62084232c8db6c4f7c4002170cc':
Fix a hang in SF caused by invalid transform matrix from the WM
Dave Burke [Wed, 19 Oct 2011 05:33:40 +0000 (22:33 -0700)]
Merge "Fix a hang in SF caused by invalid transform matrix from the WM" into ics-mr0
James Dong [Wed, 19 Oct 2011 05:17:34 +0000 (22:17 -0700)]
am
5264f600: Merge "Bail out after kMaxColorFormatSupported calls to OMX_GetParameter(). Avoid infinite loop in querying omx component about the supported color format." into ics-mr0
* commit '
5264f6003bbcb8ca70df034379154914260cc322':
Bail out after kMaxColorFormatSupported calls to OMX_GetParameter(). Avoid infinite loop in querying omx component about the supported color format.
James Dong [Wed, 19 Oct 2011 05:16:08 +0000 (22:16 -0700)]
Merge "Bail out after kMaxColorFormatSupported calls to OMX_GetParameter(). Avoid infinite loop in querying omx component about the supported color format." into ics-mr0
Mathias Agopian [Wed, 19 Oct 2011 03:24:23 +0000 (20:24 -0700)]
am
f7613743: Merge "Don\'t call hwc set() if there is nothing new to do" into ics-mr0
* commit '
f7613743f29f38cbbaf4ae09996c380845a17daf':
Don't call hwc set() if there is nothing new to do
Mathias Agopian [Wed, 19 Oct 2011 03:24:21 +0000 (20:24 -0700)]
am
23bf2505: Merge "Make sure set GL state properly" into ics-mr0
* commit '
23bf250522b7dff9acd14c5900b66b1df9c76745':
Make sure set GL state properly
Mathias Agopian [Wed, 19 Oct 2011 03:23:22 +0000 (20:23 -0700)]
Merge "Don't call hwc set() if there is nothing new to do" into ics-mr0
Mathias Agopian [Wed, 19 Oct 2011 03:23:15 +0000 (20:23 -0700)]
Merge "Make sure set GL state properly" into ics-mr0
Mathias Agopian [Thu, 13 Oct 2011 23:02:48 +0000 (16:02 -0700)]
Add a LayerScreenshot
A LayerScreenshot is a special type of layer that contains a screenshot of
the screen acquired when its created. It works just like LayerDim.
Make sure to call compositionComplete() after rendering into a FBO.
Bug:
5446982,
5467587,
5466259
Change-Id: I5d8a1b4c327f9973d950cd4f4c0bca7f62825cd4
Eric Laurent [Wed, 19 Oct 2011 02:31:12 +0000 (19:31 -0700)]
am
ecfdd7ff: Merge "Limit AudioFlinger log." into ics-mr0
* commit '
ecfdd7ff468bfc861e84fe18992e26b89cc63126':
Limit AudioFlinger log.
Eric Laurent [Wed, 19 Oct 2011 02:29:39 +0000 (19:29 -0700)]
Merge "Limit AudioFlinger log." into ics-mr0