OSDN Git Service
Romain Guy [Mon, 5 Mar 2012 21:48:55 +0000 (13:48 -0800)]
Merge "Delete display list objects and resources on the UI thread Bug #
6073717 Bug #
6065504 Bug #
6026515 Bug #
5971725"
Jeff Brown [Mon, 5 Mar 2012 21:38:59 +0000 (13:38 -0800)]
Merge "Make SQLiteDatabase final."
Jeff Brown [Mon, 5 Mar 2012 21:38:24 +0000 (13:38 -0800)]
Merge "Don't log SQLITE_SCHEMA errors."
Fabrice Di Meglio [Mon, 5 Mar 2012 21:36:20 +0000 (13:36 -0800)]
Merge "Fix bug #
6029615 Update Javadoc for onPaddingChanged()"
Scott Main [Mon, 5 Mar 2012 21:35:05 +0000 (13:35 -0800)]
am
7342817e: am
afdf856d: am
2df6ecc5: docs: add note about declaring file sizes with sample app\'s code
* commit '
7342817ec382ad45dffdf48ad34e0805ed026a2a':
Scott Main [Mon, 5 Mar 2012 21:32:20 +0000 (13:32 -0800)]
am
afdf856d: am
2df6ecc5: docs: add note about declaring file sizes with sample app\'s code
* commit '
afdf856d432fe5bae56152e42cb2c28ba63a5af0':
Scott Main [Mon, 5 Mar 2012 21:30:15 +0000 (13:30 -0800)]
am
2814c8be: am
97aa69d3: am
2df6ecc5: docs: add note about declaring file sizes with sample app\'s code
* commit '
2814c8be993ddfb2c64b0dcbeb1443427b3fca3d':
docs: add note about declaring file sizes with sample app's code
Scott Main [Mon, 5 Mar 2012 21:27:33 +0000 (13:27 -0800)]
am
97aa69d3: am
2df6ecc5: docs: add note about declaring file sizes with sample app\'s code
* commit '
97aa69d32f52499db001970829a0e654564ea551':
docs: add note about declaring file sizes with sample app's code
Scott Main [Mon, 5 Mar 2012 21:26:26 +0000 (13:26 -0800)]
am
2df6ecc5: docs: add note about declaring file sizes with sample app\'s code
* commit '
2df6ecc508f6b30fd5d005394effa64272584caa':
docs: add note about declaring file sizes with sample app's code
Scott Main [Mon, 5 Mar 2012 21:25:54 +0000 (13:25 -0800)]
am
2df6ecc5: docs: add note about declaring file sizes with sample app\'s code
* commit '
2df6ecc508f6b30fd5d005394effa64272584caa':
docs: add note about declaring file sizes with sample app's code
Romain Guy [Mon, 5 Mar 2012 21:20:46 +0000 (13:20 -0800)]
Merge "Deferred layer updates"
Dima Zavin [Mon, 5 Mar 2012 21:19:33 +0000 (13:19 -0800)]
Merge "PowerManagerService: only turn off screen when we really mean to"
Glenn Kasten [Mon, 5 Mar 2012 20:18:14 +0000 (12:18 -0800)]
Merge "threadLoop merge"
Mathias Agopian [Mon, 5 Mar 2012 20:09:45 +0000 (12:09 -0800)]
Merge "BufferQueue: fixed acquire operation"
Scott Main [Mon, 5 Mar 2012 19:58:52 +0000 (11:58 -0800)]
am
668f8125: am
a7368087: am
6f63d6fc: Merge "docs: updates to OBB guide for naming; plus other edits" into ics-mr1
* commit '
668f8125bb7e72780ee204278e4d0da189b8a4b3':
Scott Main [Mon, 5 Mar 2012 19:56:48 +0000 (11:56 -0800)]
am
a7368087: am
6f63d6fc: Merge "docs: updates to OBB guide for naming; plus other edits" into ics-mr1
* commit '
a7368087d6f1f2682174139d9cacab48dc7bc198':
Scott Main [Mon, 5 Mar 2012 19:56:43 +0000 (11:56 -0800)]
am
6c4faf74: am
6d2a18b5: am
6f63d6fc: Merge "docs: updates to OBB guide for naming; plus other edits" into ics-mr1
* commit '
6c4faf74ae45ebd705620144150acfb677844523':
docs: updates to OBB guide for naming; plus other edits
Scott Main [Mon, 5 Mar 2012 19:54:36 +0000 (11:54 -0800)]
am
6d2a18b5: am
6f63d6fc: Merge "docs: updates to OBB guide for naming; plus other edits" into ics-mr1
* commit '
6d2a18b51ee7f7f3aad0b7b76ab55a90900f9403':
docs: updates to OBB guide for naming; plus other edits
Scott Main [Mon, 5 Mar 2012 19:52:59 +0000 (11:52 -0800)]
am
6f63d6fc: Merge "docs: updates to OBB guide for naming; plus other edits" into ics-mr1
* commit '
6f63d6fc044f259b7c796e7b7e8c5c8e4a3a3aed':
docs: updates to OBB guide for naming; plus other edits
Scott Main [Mon, 5 Mar 2012 19:52:41 +0000 (11:52 -0800)]
am
6f63d6fc: Merge "docs: updates to OBB guide for naming; plus other edits" into ics-mr1
* commit '
6f63d6fc044f259b7c796e7b7e8c5c8e4a3a3aed':
docs: updates to OBB guide for naming; plus other edits
Scott Main [Mon, 5 Mar 2012 19:51:03 +0000 (11:51 -0800)]
Merge "docs: updates to OBB guide for naming; plus other edits" into ics-mr1
Dianne Hackborn [Mon, 5 Mar 2012 19:45:19 +0000 (11:45 -0800)]
Merge "More work on rotation animation."
John Reck [Mon, 5 Mar 2012 19:33:44 +0000 (11:33 -0800)]
Merge "Delete more navcache stuff"
Jeff Sharkey [Mon, 5 Mar 2012 18:49:11 +0000 (10:49 -0800)]
Merge "Report leaked Context registrations to StrictMode."
Scott Main [Mon, 5 Mar 2012 18:12:15 +0000 (10:12 -0800)]
am
79003f35: am
bde31762: am
93dc642e: docs: fix misc bugs from external tracker
* commit '
79003f35945fbbb0c55c23e8fd33085c4f129423':
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:08:54 +0000 (10:08 -0800)]
am
bde31762: am
93dc642e: docs: fix misc bugs from external tracker
* commit '
bde31762f989acbfde92e8f47ceea780cacc4e7a':
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:04 +0000 (10:06 -0800)]
am
93dc642e: docs: fix misc bugs from external tracker
* commit '
93dc642eaf48e3db58c4929df26283fbc5fd663f':
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
Daniel Lam [Fri, 2 Mar 2012 18:17:34 +0000 (10:17 -0800)]
BufferQueue: fixed acquire operation
Bug:
6082872
Change-Id: I897dc61eb84fed953e51f97871cd3ae6321505d4
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':
OSDN Git Service
