OSDN Git Service
Scott Main [Mon, 5 Mar 2012 18:09:44 +0000 (10:09 -0800)]
am
dc022a6f: am
08e91352: am
93dc642e: docs: fix misc bugs from external tracker
* commit '
dc022a6f9aa30d9282c4f82c1cc4d1c8bde7e808':
docs: fix misc bugs from external tracker
Scott Main [Mon, 5 Mar 2012 18:07:47 +0000 (10:07 -0800)]
am
08e91352: am
93dc642e: docs: fix misc bugs from external tracker
* commit '
08e91352169457ac86a2465e4db867971ce14b10':
docs: fix misc bugs from external tracker
Scott Main [Mon, 5 Mar 2012 18:06:00 +0000 (10:06 -0800)]
am
93dc642e: docs: fix misc bugs from external tracker
* commit '
93dc642eaf48e3db58c4929df26283fbc5fd663f':
docs: fix misc bugs from external tracker
Michael Kolb [Mon, 5 Mar 2012 17:16:35 +0000 (09:16 -0800)]
Merge "fix race condition in WebViewClassic.destroy()"
Alex Sakhartchouk [Mon, 5 Mar 2012 16:30:31 +0000 (08:30 -0800)]
Merge "Add multisampling support to renderscript."
Alex Sakhartchouk [Mon, 5 Mar 2012 16:29:57 +0000 (08:29 -0800)]
Merge "Using surface texture as a default renderscript surface."
Jeff Sharkey [Sat, 3 Mar 2012 02:07:35 +0000 (18:07 -0800)]
Merge "Allow disk I/O while performing dump()."
James Dong [Sat, 3 Mar 2012 01:12:24 +0000 (17:12 -0800)]
Merge "Fix some JNI issues in the drm framework"
Mike Lockwood [Sat, 3 Mar 2012 01:02:18 +0000 (17:02 -0800)]
Merge "Fix incorrect javadoc"
The Android Open Source Project [Sat, 3 Mar 2012 00:51:22 +0000 (16:51 -0800)]
Scott Main [Sat, 3 Mar 2012 00:48:36 +0000 (16:48 -0800)]
am
80bc2bf7: am
cc902c78: am
4143781c: docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app li
* commit '
80bc2bf70571aee54eb3265f41260190fe904b6e':
The Android Open Source Project [Sat, 3 Mar 2012 00:48:24 +0000 (16:48 -0800)]
am
37d6d98f: Reconcile with ics-mr1-release
* commit '
37d6d98fe3ea739627e03b78196faba55b427503':
Scott Main [Sat, 3 Mar 2012 00:45:44 +0000 (16:45 -0800)]
am
a9fae13e: am
9ad705ce: am
4143781c: docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app li
* commit '
a9fae13e81fe8211b95bd55a42f3a9b612adfe48':
docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app licensing
Scott Main [Sat, 3 Mar 2012 00:44:21 +0000 (16:44 -0800)]
am
cc902c78: am
4143781c: docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app licensing
* commit '
cc902c78e41549749ad98d96530bef25a3aeae47':
The Android Open Source Project [Sat, 3 Mar 2012 00:43:42 +0000 (16:43 -0800)]
Reconcile with ics-mr1-release
Change-Id: I8794fd70cb0e38d3c7893b782afdde0acfcffceb
Scott Main [Sat, 3 Mar 2012 00:42:36 +0000 (16:42 -0800)]
am
9ad705ce: am
4143781c: docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app licensing
* commit '
9ad705ce0b8271931f9a09d181069c7466afade4':
docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app licensing
Scott Main [Sat, 3 Mar 2012 00:40:21 +0000 (16:40 -0800)]
am
4143781c: docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app licensing
* commit '
4143781cdea0741ce6e87967c4ab903288c3e4c3':
docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app licensing
Scott Main [Sat, 3 Mar 2012 00:40:00 +0000 (16:40 -0800)]
am
4143781c: docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app licensing
* commit '
4143781cdea0741ce6e87967c4ab903288c3e4c3':
docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app licensing
The Android Open Source Project [Sat, 3 Mar 2012 00:39:54 +0000 (16:39 -0800)]
The Android Open Source Project [Sat, 3 Mar 2012 00:35:27 +0000 (16:35 -0800)]
am
3e72c93b: Reconcile with ics-mr1-release
* commit '
3e72c93b1652ec021fa0965e432b508b847b2b74':
Irfan Sheriff [Sat, 3 Mar 2012 00:33:01 +0000 (16:33 -0800)]
Merge "Enhance WPS"
The Android Open Source Project [Sat, 3 Mar 2012 00:32:56 +0000 (16:32 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ia054839cf72145c96864f64012bf980e146b1b1a
Craig Mautner [Sat, 3 Mar 2012 00:06:33 +0000 (16:06 -0800)]
Merge "Fix rotation so orientation changes aren't dropped. Modify test so that rotation animation is entered one final time after rotation completes. This last time causes mUpdateRotation to be set true forcing a test for orientation change. Fixes bug
6109189."
John Reck [Fri, 2 Mar 2012 23:37:53 +0000 (15:37 -0800)]
Merge "Fix flash"
Svetoslav Ganov [Fri, 2 Mar 2012 23:33:33 +0000 (15:33 -0800)]
Merge "Sync of the NumberPicker attributes with the public Java APIs"
Svetoslav Ganov [Fri, 2 Mar 2012 23:33:20 +0000 (15:33 -0800)]
Merge "Sync of the TimePicker attributes with the public Java APIs."
Svetoslav Ganov [Fri, 2 Mar 2012 22:57:42 +0000 (14:57 -0800)]
Merge "Fixing the build for real."
Irfan Sheriff [Fri, 2 Mar 2012 22:48:51 +0000 (14:48 -0800)]
Merge "Fix connect on a network id with zero"
Svetoslav Ganov [Fri, 2 Mar 2012 22:45:58 +0000 (14:45 -0800)]
Merge "Fixing the build"
Svetoslav Ganov [Fri, 2 Mar 2012 22:03:16 +0000 (14:03 -0800)]
Merge "Sync of the DatePicker attributes with the public Java APIs."
Glenn Kasten [Fri, 2 Mar 2012 21:48:35 +0000 (13:48 -0800)]
Merge "Fix typos and line length in AudioRecord comments"
Svetoslav Ganov [Fri, 2 Mar 2012 21:12:22 +0000 (13:12 -0800)]
Merge "Adding getter/setter for all public attributes in CalendarView."
Robert Greenwalt [Fri, 2 Mar 2012 20:00:50 +0000 (12:00 -0800)]
Merge "Fix the bug net.dns1.pid is same as net.dns2.pid"
The Android Automerger [Fri, 2 Mar 2012 19:51:23 +0000 (11:51 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Alon Albert [Fri, 2 Mar 2012 19:25:54 +0000 (11:25 -0800)]
Merge "Add a displayColor column to view_events"
Jeff Brown [Fri, 2 Mar 2012 19:15:41 +0000 (11:15 -0800)]
Merge "Add an API for deleting databases."
Jeff Brown [Fri, 2 Mar 2012 19:15:28 +0000 (11:15 -0800)]
Merge "Adjust WAL checkpoint interval."
Jean-Michel Trivi [Fri, 2 Mar 2012 19:11:05 +0000 (11:11 -0800)]
Merge "Correct GUID errors in audio effect configuration"
James Dong [Fri, 2 Mar 2012 19:01:27 +0000 (11:01 -0800)]
Merge "Fixes to DrmConvertedStatus, DrmInfoStatus, and DrmSupportInfo classes"
Martijn Coenen [Fri, 2 Mar 2012 18:13:07 +0000 (10:13 -0800)]
Merge "Hidden API for setting p2p NFC modes."
Teng-Hui Zhu [Fri, 2 Mar 2012 17:41:14 +0000 (09:41 -0800)]
Merge "Make sure egl context is valid for the onTrimMemory call"
Robert Ly [Fri, 2 Mar 2012 17:14:33 +0000 (09:14 -0800)]
Robert Ly [Fri, 2 Mar 2012 17:11:54 +0000 (09:11 -0800)]
am
b962b98b: am
67a15457: am
e5e11fd6: Merge "docs: fixing bug
5942573" into ics-mr1
* commit '
b962b98bef33eba634aec41cf9d84527ce9db3bb':
docs: fixing bug
5942573
Robert Ly [Fri, 2 Mar 2012 17:10:22 +0000 (09:10 -0800)]
Robert Ly [Fri, 2 Mar 2012 17:09:30 +0000 (09:09 -0800)]
am
67a15457: am
e5e11fd6: Merge "docs: fixing bug
5942573" into ics-mr1
* commit '
67a15457d184f01fffe162a0983d0b507cb7b358':
docs: fixing bug
5942573
Robert Ly [Fri, 2 Mar 2012 17:06:44 +0000 (09:06 -0800)]
am
e5e11fd6: Merge "docs: fixing bug
5942573" into ics-mr1
* commit '
e5e11fd666d242b099466017c6d9bd23e6d2896d':
docs: fixing bug
5942573
Robert Ly [Fri, 2 Mar 2012 17:06:44 +0000 (09:06 -0800)]
am
e5e11fd6: Merge "docs: fixing bug
5942573" into ics-mr1
* commit '
e5e11fd666d242b099466017c6d9bd23e6d2896d':
docs: fixing bug
5942573
Robert Ly [Fri, 2 Mar 2012 17:04:16 +0000 (09:04 -0800)]
Merge "docs: fixing bug
5942573" into ics-mr1
George Mount [Fri, 2 Mar 2012 16:43:43 +0000 (08:43 -0800)]
Merge "Quick fix for Monkey NPE."
Dianne Hackborn [Fri, 2 Mar 2012 16:42:22 +0000 (08:42 -0800)]
am
d4202c9d: am
921e8303: am
0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1
* commit '
d4202c9d138459a60fde708ecda995f3b599d252':
Dianne Hackborn [Fri, 2 Mar 2012 16:39:39 +0000 (08:39 -0800)]
am
5d87d51f: am
f65951bf: am
0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1
* commit '
5d87d51fab7e17793413c9095028963117e276b8':
Make ResolverActivity update dynamically.
Dianne Hackborn [Fri, 2 Mar 2012 16:37:48 +0000 (08:37 -0800)]
am
921e8303: am
0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1
* commit '
921e83039d266b6d288fd5e09160d878eccb9e23':
Dianne Hackborn [Fri, 2 Mar 2012 16:36:05 +0000 (08:36 -0800)]
am
f65951bf: am
0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1
* commit '
f65951bf5db7a248651cbfa89886d773f95c3e03':
Make ResolverActivity update dynamically.
Dianne Hackborn [Fri, 2 Mar 2012 16:33:22 +0000 (08:33 -0800)]
am
0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1
* commit '
0dd9ec144b0da8df9d8900d78c8177e761de458d':
Make ResolverActivity update dynamically.
Dianne Hackborn [Fri, 2 Mar 2012 16:33:21 +0000 (08:33 -0800)]
am
0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1
* commit '
0dd9ec144b0da8df9d8900d78c8177e761de458d':
Make ResolverActivity update dynamically.
Dianne Hackborn [Fri, 2 Mar 2012 16:30:36 +0000 (08:30 -0800)]
Merge "Make ResolverActivity update dynamically." into ics-mr1
Adam Powell [Fri, 2 Mar 2012 07:57:10 +0000 (23:57 -0800)]
am
d9760a81: am
25517fdc: am
637c50db: am
c7e5a2fe: Merge "Fix dividers for LinearLayout (TabWidget)"
* commit '
d9760a813e99670c5bdb05c95ae3bafb58abf897':
Fix dividers for LinearLayout (TabWidget)
Adam Powell [Fri, 2 Mar 2012 06:52:39 +0000 (22:52 -0800)]
am
25517fdc: am
637c50db: am
c7e5a2fe: Merge "Fix dividers for LinearLayout (TabWidget)"
* commit '
25517fdc53018ef676a1d340e2d5cbd780e5dc8b':
Fix dividers for LinearLayout (TabWidget)
Adam Powell [Fri, 2 Mar 2012 06:49:46 +0000 (22:49 -0800)]
am
637c50db: am
c7e5a2fe: Merge "Fix dividers for LinearLayout (TabWidget)"
* commit '
637c50db476d9a6cec13551920f7c163fef02ab8':
Fix dividers for LinearLayout (TabWidget)
Adam Powell [Fri, 2 Mar 2012 06:46:26 +0000 (22:46 -0800)]
am
c7e5a2fe: Merge "Fix dividers for LinearLayout (TabWidget)"
* commit '
c7e5a2fe3042014f78667228a92e41d0a19547fd':
Fix dividers for LinearLayout (TabWidget)
Mathias Agopian [Fri, 2 Mar 2012 05:22:35 +0000 (21:22 -0800)]
Merge "add more tracing for buffer allocation"
Mathias Agopian [Fri, 2 Mar 2012 05:22:25 +0000 (21:22 -0800)]
Merge "add more ATRACE"
Mathias Agopian [Thu, 1 Mar 2012 23:44:37 +0000 (15:44 -0800)]
add more ATRACE
Change-Id: I6cc5759fb0a05427680488fd12ae797e77644f3d
Craig Mautner [Fri, 2 Mar 2012 03:29:46 +0000 (19:29 -0800)]
Merge "Separate animation steps into start, step and finish phases. Fixes bug
6089126."
Dianne Hackborn [Fri, 2 Mar 2012 03:21:40 +0000 (19:21 -0800)]
Merge "Whoops forgot this change."
Dianne Hackborn [Fri, 2 Mar 2012 03:21:22 +0000 (19:21 -0800)]
Merge "Fix issue where pm would clear preferred apps when updating an app."
Jim Miller [Fri, 2 Mar 2012 03:02:19 +0000 (19:02 -0800)]
Merge "Fix
6028595: Fix reboot loop in AccountUnlock due to null callback"
Fabrice Di Meglio [Fri, 2 Mar 2012 01:44:19 +0000 (17:44 -0800)]
Merge "Improve RTL APIs"
Romain Guy [Fri, 2 Mar 2012 01:35:25 +0000 (17:35 -0800)]
Merge "Remove stray log"
Tsu Chiang Chuang [Fri, 2 Mar 2012 01:15:32 +0000 (17:15 -0800)]
am
8f0c03b7: am
673a66e3: am
3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1
* commit '
8f0c03b7833c719c29198be0e4fecbdfb4013e64':
Tsu Chiang Chuang [Fri, 2 Mar 2012 01:12:55 +0000 (17:12 -0800)]
am
6053b195: am
bb69bde5: am
3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1
* commit '
6053b195bcd49676b46b2257f6e1da04d0b4d9a5':
extend timeout to allow for more time for the device to connect.
Tsu Chiang Chuang [Fri, 2 Mar 2012 01:11:22 +0000 (17:11 -0800)]
am
673a66e3: am
3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1
* commit '
673a66e357f49f939cf8e7f603ff14b8474c9032':
Tsu Chiang Chuang [Fri, 2 Mar 2012 01:10:23 +0000 (17:10 -0800)]
am
bb69bde5: am
3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1
* commit '
bb69bde593bc0ba58c744b19c43619d4eb0866b7':
extend timeout to allow for more time for the device to connect.
Tsu Chiang Chuang [Fri, 2 Mar 2012 01:07:43 +0000 (17:07 -0800)]
am
3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1
* commit '
3e70127021f5d5940edfdefd7e33fd65d4ec0449':
extend timeout to allow for more time for the device to connect.
Tsu Chiang Chuang [Fri, 2 Mar 2012 01:07:25 +0000 (17:07 -0800)]
am
3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1
* commit '
3e70127021f5d5940edfdefd7e33fd65d4ec0449':
extend timeout to allow for more time for the device to connect.
Tsu Chiang Chuang [Fri, 2 Mar 2012 01:05:43 +0000 (17:05 -0800)]
Merge "extend timeout to allow for more time for the device to connect." into ics-mr1
Wink Saville [Fri, 2 Mar 2012 01:03:47 +0000 (17:03 -0800)]
Merge "Telephony: Remove SimCard and RuimCard"
Robert Ly [Fri, 2 Mar 2012 00:47:06 +0000 (16:47 -0800)]
Robert Ly [Fri, 2 Mar 2012 00:47:04 +0000 (16:47 -0800)]
Robert Ly [Fri, 2 Mar 2012 00:46:58 +0000 (16:46 -0800)]
Robert Ly [Fri, 2 Mar 2012 00:46:55 +0000 (16:46 -0800)]
am
b4afb9a8: am
8125b0b4: am
dcc910ea: Merge "docs: fix bug
5878445" into ics-mr1
* commit '
b4afb9a89e1a2131ac273f0452fa89b83090b05a':
docs: fix bug
5878445
The Android Open Source Project [Fri, 2 Mar 2012 00:46:44 +0000 (16:46 -0800)]
Jeff Brown [Fri, 2 Mar 2012 00:43:41 +0000 (16:43 -0800)]
Merge "Shouldn't catch Throwable in AsyncTask."
Irfan Sheriff [Fri, 2 Mar 2012 00:26:52 +0000 (16:26 -0800)]
Merge "Fix WifiManager async API"
Adam Powell [Fri, 2 Mar 2012 00:26:03 +0000 (16:26 -0800)]
Merge "Fix dividers for LinearLayout (TabWidget)"
Fabrice Di Meglio [Fri, 2 Mar 2012 00:23:29 +0000 (16:23 -0800)]
Merge "Make layoutDirection API public"
Brian Carlstrom [Fri, 2 Mar 2012 00:22:13 +0000 (16:22 -0800)]
Merge "Remove obsolete KeyChain references to USE_CREDENTIALS (2 of 2)"
Teng-Hui Zhu [Fri, 2 Mar 2012 00:04:18 +0000 (16:04 -0800)]
Merge "Allow webview to delete GL resource in a valid EGL context"
The Android Open Source Project [Thu, 1 Mar 2012 23:51:34 +0000 (15:51 -0800)]
Andreas Huber [Thu, 1 Mar 2012 23:46:19 +0000 (15:46 -0800)]
Merge "Remove hacks that worked around issues in OMX components several releases back."
Android Git Automerger [Thu, 1 Mar 2012 23:35:49 +0000 (15:35 -0800)]
am
55fbbce4: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp
* commit '
55fbbce495723a5b17f1b4684d0f9826c75caa97':
Yu Shan Emily Lau [Thu, 1 Mar 2012 23:35:47 +0000 (15:35 -0800)]
am
da0c4a3e: am
d12347b2: am
eb4f3256: Set the video encoding bit rate for the media recorder stress test.
* commit '
da0c4a3ea653a866d6a8fe00bc52f27d0841874b':
Yu Shan Emily Lau [Thu, 1 Mar 2012 23:35:43 +0000 (15:35 -0800)]
am
353b61a8: am
0ddfe24a: am
eb4f3256: Set the video encoding bit rate for the media recorder stress test.
* commit '
353b61a87d9eb0ee223bdda76c30a1364441d962':
Set the video encoding bit rate for the media recorder stress test.
Jean-Baptiste Queru [Thu, 1 Mar 2012 23:35:39 +0000 (15:35 -0800)]
am
f73222a3: am
964955e0: am
8a9b14d8: am
5aeb8587: Merge "DRM framwork bug fix: add an API to release resources"
* commit '
f73222a39e0fa294d9105fd7464943aed6e77cd7':
DRM framwork bug fix: add an API to release resources
Jean-Baptiste Queru [Thu, 1 Mar 2012 23:35:37 +0000 (15:35 -0800)]
am
f09c0c7f: am
93920d79: am
a66be970: am
11aa4cc3: Merge "Set width of spinner\'s dropdown to fit on device"
* commit '
f09c0c7f31e72611d91b4ac91ce5a9f019b16083':
Set width of spinner's dropdown to fit on device
Jean-Baptiste Queru [Thu, 1 Mar 2012 23:35:33 +0000 (15:35 -0800)]
am
dbc591e2: am
c69d6134: am
6ae4fe94: am
9303919d: Merge "Adds documentation for ContentResolver notifyChange()"
* commit '
dbc591e27686486c732fca2f94fde645e3487b7a':
Adds documentation for ContentResolver notifyChange()
Jean-Baptiste Queru [Thu, 1 Mar 2012 23:35:25 +0000 (15:35 -0800)]
am
9de7793b: am
4f906362: am
97348431: am
704131cb: Merge changes I46c81dba,If1f40e9c,I652eaaa5
* commit '
9de7793b425be89889412f3a86466d7b19055c3c':
stagefright aacenc: Use QDADD/QDSUB instructions
stagefright aacenc: Remove useless inline asm for simple right shift
stagefright aacenc: Use ARMv6 SSAT instruction
Jean-Baptiste Queru [Thu, 1 Mar 2012 23:35:23 +0000 (15:35 -0800)]
am
715c78b9: am
225eec8d: am
f9d4ba77: am
69aae36e: Merge "stagefright aacenc: Safeguard against overwriting bits"
* commit '
715c78b933f8dec04882ebb73acd61fdd42c6c64':
stagefright aacenc: Safeguard against overwriting bits
Eric Fischer [Thu, 1 Mar 2012 23:32:24 +0000 (15:32 -0800)]
am
4917bc10: am
d31da0a6: am
fb393f8b: Mark configuration strings as not translatable.
* commit '
4917bc104da1725d7ba093713de3802dec1515e5':
Eric Fischer [Thu, 1 Mar 2012 23:32:22 +0000 (15:32 -0800)]
am
b145e363: (-s ours) am
ba62da99: am
fb393f8b: Mark configuration strings as not translatable.
* commit '
b145e363ff4e00048cdc9035300a6db05aa0fbb5':
Mark configuration strings as not translatable.