OSDN Git Service
James Dong [Mon, 11 Jul 2011 19:46:35 +0000 (12:46 -0700)]
Merge "Release camera if CameraSource::start() has not been called"
Mike Lockwood [Mon, 11 Jul 2011 19:15:21 +0000 (12:15 -0700)]
Merge "Remove unnecessary locking from MediaScanner JNI code"
Elliott Hughes [Mon, 11 Jul 2011 18:24:54 +0000 (11:24 -0700)]
Merge "SDK_INT is not "current" on unreleased builds."
Andy McFadden [Mon, 11 Jul 2011 18:24:23 +0000 (11:24 -0700)]
Merge "Relocate common Calendar classes"
Fabrice Di Meglio [Mon, 11 Jul 2011 17:52:09 +0000 (10:52 -0700)]
Merge "Fix View reset of layoutDirection and textDirection"
Freeman Ng [Mon, 11 Jul 2011 17:46:12 +0000 (10:46 -0700)]
Merge "remove old style button bar look"
Mike Lockwood [Mon, 11 Jul 2011 17:41:52 +0000 (10:41 -0700)]
Merge "UsbDeviceManager: Fix indentation"
Mike Lockwood [Mon, 11 Jul 2011 17:41:08 +0000 (10:41 -0700)]
Merge "MTP: Return error if user tries to copy a file >= 4GB to a FAT32 file system"
Mike Lockwood [Mon, 11 Jul 2011 16:12:21 +0000 (09:12 -0700)]
Merge "MediaScanner: Use bulk inserts when in batch mode"
Jeff Sharkey [Sun, 10 Jul 2011 23:18:58 +0000 (16:18 -0700)]
Merge "Cached NTP time for system services."
Jim Miller [Sun, 10 Jul 2011 21:35:32 +0000 (14:35 -0700)]
Merge "Fix
4942542,
4590542: Password unlock fixes"
Elliott Hughes [Sat, 9 Jul 2011 01:11:41 +0000 (18:11 -0700)]
Merge "Pass the targetSdkVersion through to the zygote-forked dalvik."
Robert Ly [Sat, 9 Jul 2011 00:53:12 +0000 (17:53 -0700)]
am
d9f91425: am
6b98e712: am
3f3b8cbf: Merge "cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052" into honeycomb-mr2
* commit '
d9f91425fc740bc85a8629a27b68b48acaf85962':
cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052
Joe Malin [Sat, 9 Jul 2011 00:53:09 +0000 (17:53 -0700)]
am
f84bb997: am
230ef987: am
0e89d916: Merge "DOC CHANGE: Change GTV info on intro page" into honeycomb-mr2
* commit '
f84bb997717501e0af8672608c9d5bd89abe5334':
DOC CHANGE: Change GTV info on intro page
Joe Fernandez [Sat, 9 Jul 2011 00:53:06 +0000 (17:53 -0700)]
am
d1c15f96: am
20f65201: am
0fbe1dfb: Merge "cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c" into honeycomb-mr2
* commit '
d1c15f96dd2e3b07da6968ea54f6f2bdebe8e190':
cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c
Wink Saville [Sat, 9 Jul 2011 00:52:56 +0000 (17:52 -0700)]
am
3ef341cd: am
7283bb93: Merge "Disconnect ApnContexts in INITING state when error." into honeycomb-LTE
* commit '
3ef341cda51d5bc35b0bc919f7514653ec194410':
Disconnect ApnContexts in INITING state when error.
Wink Saville [Sat, 9 Jul 2011 00:48:37 +0000 (17:48 -0700)]
Merge "resolved conflicts for merge of
e4a56a32 to master"
Rajneesh Chowdury [Sat, 9 Jul 2011 00:00:08 +0000 (17:00 -0700)]
Merge "Fix for issue
5007228 IllegalArgumentException when testing VideoEditorAPITest#testEffectKenBurn"
Romain Guy [Fri, 8 Jul 2011 23:53:23 +0000 (16:53 -0700)]
Merge "Align paths on pixel boundaries when rasterizing in bitmaps. Bug #
5003739"
Shimeng (Simon) Wang [Fri, 8 Jul 2011 23:48:23 +0000 (16:48 -0700)]
Merge "Prevent set mInitialScale being overridden by mDefaultScale."
Romain Guy [Fri, 8 Jul 2011 23:27:47 +0000 (16:27 -0700)]
Merge "Correctly render nested rectangles with different winding rules."
Gilles Debunne [Fri, 8 Jul 2011 23:02:36 +0000 (16:02 -0700)]
Merge "Fleshed up SuggestionSpan documentation. Bug
4553472"
Romain Guy [Fri, 8 Jul 2011 22:54:10 +0000 (15:54 -0700)]
Merge "Always redraw the UI on orientation change Bug #
4994715"
Adam Powell [Fri, 8 Jul 2011 22:38:31 +0000 (15:38 -0700)]
Merge "The COLORS!!"
Mathias Agopian [Fri, 8 Jul 2011 22:34:50 +0000 (15:34 -0700)]
Merge "fix screen on/off animation (again)"
Mathias Agopian [Fri, 8 Jul 2011 22:34:33 +0000 (15:34 -0700)]
Merge "Add a simple EGL test"
Mathias Agopian [Fri, 8 Jul 2011 22:34:23 +0000 (15:34 -0700)]
Merge "Fix EGLUtils::selectConfigForPixelFormat()"
RoboErik [Fri, 8 Jul 2011 22:28:26 +0000 (15:28 -0700)]
Merge "Unhide CalendarContract apis"
Jaikumar Ganesh [Fri, 8 Jul 2011 22:01:18 +0000 (15:01 -0700)]
Merge "Get server's listening channel"
Gilles Debunne [Fri, 8 Jul 2011 21:56:14 +0000 (14:56 -0700)]
Merge "Animation settings reset to default"
Mathias Agopian [Thu, 7 Jul 2011 21:54:30 +0000 (14:54 -0700)]
Add a simple EGL test
currently it just tests EGLConfig selection
Change-Id: Id9d9971012d733147dd7dc02fa2054307960235e
Mathias Agopian [Fri, 8 Jul 2011 00:30:31 +0000 (17:30 -0700)]
fix screen on/off animation (again)
- surfaceflinger now uses the GL-convention of
placing the origin in the left-bottom corner
- map texture coordinates of the screen capture
properly
- add the ability to control the animation
speed through a debug property
Bug:
4989276
Change-Id: Ifb3297bb578078b47146fff666c01f85417e0d6f
Mathias Agopian [Wed, 6 Jul 2011 23:35:30 +0000 (16:35 -0700)]
Fix EGLUtils::selectConfigForPixelFormat()
- renderscript now calls EGL directly instead of relying on this function
- surfaceflinger also does its own EGLConfig selection
- selectConfigForPixelFormat stays for legacy reason (many tests use it) but
it now only tries to match the alpha channel of the format rather than the
format itself.
this will allow implementations who don't support the exact formats
defined in the HAL to work properly.
Bug:
4998223
Change-Id: Ic664dfc14d5072a514b6f77a115d1521bfc1578f
James Dong [Fri, 8 Jul 2011 21:17:16 +0000 (14:17 -0700)]
Merge "Use advertised h264 encoding parameters by default if the profile is not baseline"
Glenn Kasten [Fri, 8 Jul 2011 21:06:24 +0000 (14:06 -0700)]
Merge "Fix build warning; LOG_TAG was misplaced"
RoboErik [Fri, 8 Jul 2011 21:05:42 +0000 (14:05 -0700)]
Merge "Pseudo-final api fixes to CalendarContract"
Jim Miller [Fri, 8 Jul 2011 20:14:38 +0000 (13:14 -0700)]
Merge "Fix
4689527: Improved curation for Recents + misc cleanup"
Wink Saville [Fri, 8 Jul 2011 19:49:14 +0000 (12:49 -0700)]
resolved conflicts for merge of
e4a56a32 to master
Change-Id: I50f8fe61303efa78f5d450ddda1483e0ecb81d12
Christopher Tate [Fri, 8 Jul 2011 19:48:48 +0000 (12:48 -0700)]
Merge "Can now restore a subset of apps from historical dataset"
John Reck [Fri, 8 Jul 2011 19:43:22 +0000 (12:43 -0700)]
Merge "NPE guard in setupViewport"
Wink Saville [Fri, 8 Jul 2011 19:28:27 +0000 (12:28 -0700)]
am
a736cd54: am
848aa3ab: Merge "No need to have BASE_DATA_CONNECTION_TRACKER start at 50000." into honeycomb-LTE
* commit '
a736cd54e1de62e84a7a49a3c68c56fc6d9bfc00':
No need to have BASE_DATA_CONNECTION_TRACKER start at 50000.
Romain Guy [Fri, 8 Jul 2011 18:58:18 +0000 (11:58 -0700)]
Merge "Correctly position layers."
Kristian Monsen [Fri, 8 Jul 2011 18:31:33 +0000 (11:31 -0700)]
Merge "Merge Chromium at r12.0.742.93: New autofill string"
Robert Greenwalt [Fri, 8 Jul 2011 18:06:55 +0000 (11:06 -0700)]
Merge "Remove unused setHttpProxy."
Robert Ly [Fri, 8 Jul 2011 17:44:10 +0000 (10:44 -0700)]
am
6b98e712: am
3f3b8cbf: Merge "cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052" into honeycomb-mr2
* commit '
6b98e7128b3fbfd8b2c421286c403e4609c69708':
cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052
Joe Malin [Fri, 8 Jul 2011 17:41:54 +0000 (10:41 -0700)]
am
230ef987: am
0e89d916: Merge "DOC CHANGE: Change GTV info on intro page" into honeycomb-mr2
* commit '
230ef98728f3b59a81f55dab5129aa50d5f27969':
DOC CHANGE: Change GTV info on intro page
Joe Fernandez [Fri, 8 Jul 2011 17:41:35 +0000 (10:41 -0700)]
am
20f65201: am
0fbe1dfb: Merge "cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c" into honeycomb-mr2
* commit '
20f6520197a6b70123d2ff7c466ee58349ae3032':
cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c
Robert Ly [Fri, 8 Jul 2011 17:39:46 +0000 (10:39 -0700)]
am
3f3b8cbf: Merge "cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052" into honeycomb-mr2
* commit '
3f3b8cbfa775f2ebff985c069300f8daaeb7a84c':
cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052
Robert Ly [Fri, 8 Jul 2011 17:13:28 +0000 (10:13 -0700)]
Merge "cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052" into honeycomb-mr2
Wink Saville [Fri, 8 Jul 2011 16:40:11 +0000 (09:40 -0700)]
am
7283bb93: Merge "Disconnect ApnContexts in INITING state when error." into honeycomb-LTE
* commit '
7283bb9323c83621a818c387bb80fe1bc9d6aa7c':
Disconnect ApnContexts in INITING state when error.
Wink Saville [Fri, 8 Jul 2011 16:40:08 +0000 (09:40 -0700)]
am
8171e6f6: Use resetConnections with resetMask.
* commit '
8171e6f690cca1bad354e7e352823d79d420daf3':
Use resetConnections with resetMask.
Wink Saville [Fri, 8 Jul 2011 16:40:03 +0000 (09:40 -0700)]
am
848aa3ab: Merge "No need to have BASE_DATA_CONNECTION_TRACKER start at 50000." into honeycomb-LTE
* commit '
848aa3ab8a00835c5af2ead954c7736e507249b5':
No need to have BASE_DATA_CONNECTION_TRACKER start at 50000.
Joe Malin [Fri, 8 Jul 2011 16:39:25 +0000 (09:39 -0700)]
am
0e89d916: Merge "DOC CHANGE: Change GTV info on intro page" into honeycomb-mr2
* commit '
0e89d916f078a518093c476725fa7e0798dcc590':
DOC CHANGE: Change GTV info on intro page
Joe Fernandez [Fri, 8 Jul 2011 16:39:22 +0000 (09:39 -0700)]
am
0fbe1dfb: Merge "cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c" into honeycomb-mr2
* commit '
0fbe1dfb8df94a51d79e9a42fcbaebed6f6e516e':
cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c
Wink Saville [Fri, 8 Jul 2011 05:00:56 +0000 (22:00 -0700)]
Merge "Disconnect ApnContexts in INITING state when error." into honeycomb-LTE
Romain Guy [Fri, 8 Jul 2011 04:35:19 +0000 (21:35 -0700)]
Merge "Cleanup"
Romain Guy [Fri, 8 Jul 2011 04:28:41 +0000 (21:28 -0700)]
Merge "Use NEAREST filtering mode for TextureView.getBitmap()."
Adam Powell [Fri, 8 Jul 2011 03:55:10 +0000 (20:55 -0700)]
Merge "Add ALL CAPS style to TextView/TextAppearance"
Romain Guy [Fri, 8 Jul 2011 03:55:08 +0000 (20:55 -0700)]
Merge "Use NEAREST filtering for layers whenever possible."
Joe Malin [Fri, 8 Jul 2011 01:19:18 +0000 (18:19 -0700)]
Merge "DOC CHANGE: Change GTV info on intro page" into honeycomb-mr2
Michael Jurka [Thu, 7 Jul 2011 23:28:03 +0000 (16:28 -0700)]
Merge "Handling Resources.NotFoundException in Recents"
Jason Sams [Thu, 7 Jul 2011 23:24:51 +0000 (16:24 -0700)]
Merge "Fix more type info caching bugs."
Shimeng (Simon) Wang [Thu, 7 Jul 2011 23:17:16 +0000 (16:17 -0700)]
Merge "Update viewport asap."
Jason Sams [Thu, 7 Jul 2011 23:10:38 +0000 (16:10 -0700)]
Merge "Fix defered type creation when loading from A3D."
Gilles Debunne [Thu, 7 Jul 2011 23:07:07 +0000 (16:07 -0700)]
Merge "XmlDocumentProvider moved to the XmlAdapter sample code"
Jason Sams [Thu, 7 Jul 2011 22:50:41 +0000 (15:50 -0700)]
Merge "AllocationAdapter cleanup."
Eric Laurent [Thu, 7 Jul 2011 22:37:07 +0000 (15:37 -0700)]
Merge "Moved and renamed effect API header files"
Joe Fernandez [Thu, 7 Jul 2011 22:33:15 +0000 (15:33 -0700)]
Merge "Revert "docs: OpenGL Tutorials""
Huahui Wu [Thu, 7 Jul 2011 22:10:25 +0000 (15:10 -0700)]
Merge "Revert "b/
3302378 Passes touch pressures, size and timestamps to webkit.""
Joe Fernandez [Thu, 7 Jul 2011 22:03:55 +0000 (15:03 -0700)]
Merge "cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c" into honeycomb-mr2
Jamie Gennis [Thu, 7 Jul 2011 21:42:12 +0000 (14:42 -0700)]
Merge "SurfaceTexture: enable newly passing tests."
Wink Saville [Thu, 7 Jul 2011 21:39:23 +0000 (14:39 -0700)]
Merge "No need to have BASE_DATA_CONNECTION_TRACKER start at 50000." into honeycomb-LTE
Adam Powell [Thu, 7 Jul 2011 21:35:22 +0000 (14:35 -0700)]
Merge "Action bar layout tweaks"
Jim Miller [Thu, 7 Jul 2011 21:35:18 +0000 (14:35 -0700)]
Merge "Fix
4689527: Fix rendering issue with thumbnails on phones"
Joe Fernandez [Thu, 7 Jul 2011 21:31:02 +0000 (14:31 -0700)]
Merge "docs: OpenGL Tutorials"
Philip Milne [Thu, 7 Jul 2011 21:30:31 +0000 (14:30 -0700)]
Merge "Simplify and tidy the API for maximum value support."
Romain Guy [Thu, 7 Jul 2011 21:10:52 +0000 (14:10 -0700)]
Merge "Add an API to query maximum bitmap/texture size on Canvas."
Jim Miller [Thu, 7 Jul 2011 20:58:13 +0000 (13:58 -0700)]
Merge "Fix
4689527: Update Recents"
Daniel Lehmann [Thu, 7 Jul 2011 20:34:59 +0000 (13:34 -0700)]
Merge "Contacts contract changes for social updates."
James Dong [Thu, 7 Jul 2011 20:34:58 +0000 (13:34 -0700)]
Merge "Add support for some custom YUV420 color formats to recordvideo utility"
Eric Fischer [Thu, 7 Jul 2011 18:33:38 +0000 (11:33 -0700)]
Merge "Import revised translations."
Scott Main [Thu, 7 Jul 2011 18:23:25 +0000 (11:23 -0700)]
am
33f6d634: am
e4e1c3fd: am
40afb97c: cherrypick Change-Id: I51ac719e414ac2794ff446d992bb946acb0fa896 docs: add button builder for android market apps
* commit '
33f6d6347b88d239b16a6b3f28adcb7bf4a61881':
cherrypick Change-Id: I51ac719e414ac2794ff446d992bb946acb0fa896 docs: add button builder for android market apps
Scott Main [Thu, 7 Jul 2011 18:23:22 +0000 (11:23 -0700)]
am
9638fbcf: am
0657e1a7: am
77dfe217: cherrypick Change-Id: I2f4c79c5874835bd643b21f7a8ff3649ca27ecfb docs: update dashboards
* commit '
9638fbcfd2c4449075ead8545a759a4d4dd03a28':
cherrypick Change-Id: I2f4c79c5874835bd643b21f7a8ff3649ca27ecfb docs: update dashboards
Wink Saville [Thu, 7 Jul 2011 18:22:34 +0000 (11:22 -0700)]
am
19065008: am
48b6d5af: Merge "Reset FAILED ApnContext state to IDLE on data setup triggers" into honeycomb-LTE
* commit '
19065008b820ea95530d49cf1894f7481929f8e6':
Reset FAILED ApnContext state to IDLE on data setup triggers
Robert Ly [Thu, 7 Jul 2011 18:22:31 +0000 (11:22 -0700)]
am
6c9d636f: am
027654e9: am
ad2724de: cherrypicking from hc-mr1 Change-Id: I4f4ccbd73db94070274d4e6195df38b19b2245b8
* commit '
6c9d636f40477ef3ac44a6e30ac645d708d89002':
cherrypicking from hc-mr1 Change-Id: I4f4ccbd73db94070274d4e6195df38b19b2245b8
Kazuhiro Ondo [Thu, 7 Jul 2011 18:22:10 +0000 (11:22 -0700)]
am
6716ac53: am
c8e2916d: Bring back ERI into CDMA-LTE mode
* commit '
6716ac5342de7e83e5ba47f28aac40a46d1363ac':
Bring back ERI into CDMA-LTE mode
Wink Saville [Thu, 7 Jul 2011 18:05:51 +0000 (11:05 -0700)]
am
5eeeea29: am
97667d0c: Merge "Allow vril-dump to work on user builds" into honeycomb-LTE
* commit '
5eeeea29ecd731897211d31bde7ee87af182420c':
Allow vril-dump to work on user builds
Huahui Wu [Thu, 7 Jul 2011 18:05:13 +0000 (11:05 -0700)]
Merge "b/
3302378 Passes touch pressures, size and timestamps to webkit."
Jeff Sharkey [Thu, 7 Jul 2011 17:23:44 +0000 (10:23 -0700)]
Merge "Temporarily disable socket tagging."
Scott Main [Thu, 7 Jul 2011 17:17:00 +0000 (10:17 -0700)]
am
e4e1c3fd: am
40afb97c: cherrypick Change-Id: I51ac719e414ac2794ff446d992bb946acb0fa896 docs: add button builder for android market apps
* commit '
e4e1c3fda937d30c9aa75a43c470de6c54a97073':
cherrypick Change-Id: I51ac719e414ac2794ff446d992bb946acb0fa896 docs: add button builder for android market apps
Scott Main [Thu, 7 Jul 2011 17:14:38 +0000 (10:14 -0700)]
am
0657e1a7: am
77dfe217: cherrypick Change-Id: I2f4c79c5874835bd643b21f7a8ff3649ca27ecfb docs: update dashboards
* commit '
0657e1a7e7d25fee700930252f6b85c3d70bc368':
cherrypick Change-Id: I2f4c79c5874835bd643b21f7a8ff3649ca27ecfb docs: update dashboards
Scott Main [Thu, 7 Jul 2011 17:13:44 +0000 (10:13 -0700)]
am
40afb97c: cherrypick Change-Id: I51ac719e414ac2794ff446d992bb946acb0fa896 docs: add button builder for android market apps
* commit '
40afb97c3289cd3daae9a31f4829d660ba747d37':
cherrypick Change-Id: I51ac719e414ac2794ff446d992bb946acb0fa896 docs: add button builder for android market apps
Scott Main [Thu, 7 Jul 2011 17:10:29 +0000 (10:10 -0700)]
am
77dfe217: cherrypick Change-Id: I2f4c79c5874835bd643b21f7a8ff3649ca27ecfb docs: update dashboards
* commit '
77dfe2173e2970a6a662b7d9537715c81886185e':
cherrypick Change-Id: I2f4c79c5874835bd643b21f7a8ff3649ca27ecfb docs: update dashboards
Robert Ly [Thu, 7 Jul 2011 16:54:18 +0000 (09:54 -0700)]
am
f870327d: am
bc45fcbb: am
205d1c34: cherrypicking tools and adt r12 relnotes from hc-mr1 Change-Id: I0ea492417581c062f6433e23345fe3fe398709c0
* commit '
f870327d5dc8a914d0fc55f454b6378f3e504d79':
cherrypicking tools and adt r12 relnotes from hc-mr1 Change-Id: I0ea492417581c062f6433e23345fe3fe398709c0
Jean-Baptiste Queru [Thu, 7 Jul 2011 15:46:09 +0000 (08:46 -0700)]
Merge
37dbfcaf
Change-Id: Iae55ecada8dc231c88bb87b32e8bd5e7b6a47bd0
Adrian Ludwig [Thu, 7 Jul 2011 15:08:13 +0000 (08:08 -0700)]
Merge "Android security code review."
Irfan Sheriff [Thu, 7 Jul 2011 05:08:38 +0000 (22:08 -0700)]
Merge "Moved WifiWatchdogService and DnsPinger"
Wink Saville [Thu, 7 Jul 2011 02:05:40 +0000 (19:05 -0700)]
am
48b6d5af: Merge "Reset FAILED ApnContext state to IDLE on data setup triggers" into honeycomb-LTE
* commit '
48b6d5afae76bec08c5e1194758e6db3e0f8b07c':
Reset FAILED ApnContext state to IDLE on data setup triggers
Wink Saville [Thu, 7 Jul 2011 02:04:30 +0000 (19:04 -0700)]
Merge "Reset FAILED ApnContext state to IDLE on data setup triggers" into honeycomb-LTE
Robert Ly [Thu, 7 Jul 2011 01:19:26 +0000 (18:19 -0700)]
am
027654e9: am
ad2724de: cherrypicking from hc-mr1 Change-Id: I4f4ccbd73db94070274d4e6195df38b19b2245b8
* commit '
027654e90da14275fbf076e739e16f89c4fcae2c':
cherrypicking from hc-mr1 Change-Id: I4f4ccbd73db94070274d4e6195df38b19b2245b8