OSDN Git Service
John Reck [Wed, 7 Mar 2012 01:05:48 +0000 (17:05 -0800)]
Merge "Fix unhandled navigation path"
John Reck [Wed, 7 Mar 2012 01:04:13 +0000 (17:04 -0800)]
Merge "Fix FOCUS_BACKWARD search if view had no id"
Jeff Brown [Wed, 7 Mar 2012 00:51:13 +0000 (16:51 -0800)]
Merge "Don't close the database until all references released."
Glenn Kasten [Wed, 7 Mar 2012 00:22:30 +0000 (16:22 -0800)]
Merge "Rename fields of AudioSessionRef"
Glenn Kasten [Tue, 6 Mar 2012 23:23:58 +0000 (15:23 -0800)]
Merge "Fix indentation for re-organized code"
Nicolas Roard [Tue, 6 Mar 2012 22:13:54 +0000 (14:13 -0800)]
Merge "Pass the version down to native"
Gilles Debunne [Tue, 6 Mar 2012 21:57:16 +0000 (13:57 -0800)]
Merge "Ellipsize avoids spaces and starts right after text"
Glenn Kasten [Tue, 6 Mar 2012 21:44:56 +0000 (13:44 -0800)]
Merge "Rename updateWaitTime since a lock is held"
Fabrice Di Meglio [Tue, 6 Mar 2012 19:48:14 +0000 (11:48 -0800)]
Merge "Fix bug #
4972463 Update CTS tests for TextView textDirection"
Robert Greenwalt [Tue, 6 Mar 2012 19:30:28 +0000 (11:30 -0800)]
Merge "Make NDC not block forever and handle restart."
Craig Mautner [Tue, 6 Mar 2012 19:12:40 +0000 (11:12 -0800)]
Merge "Fix deadlock by making DropBoxManager call async."
Eric Laurent [Tue, 6 Mar 2012 18:53:39 +0000 (10:53 -0800)]
Merge "MediaPlayerService: fix AudioSink latency"
Eric Laurent [Tue, 6 Mar 2012 18:52:18 +0000 (10:52 -0800)]
Merge "AudioTrack: relax check on minimum buffer size"
Dianne Hackborn [Tue, 6 Mar 2012 18:34:18 +0000 (10:34 -0800)]
Merge "Fix issues #
6103378 and #
5959515."
James Dong [Tue, 6 Mar 2012 18:23:58 +0000 (10:23 -0800)]
Merge "Remove unused code - MediaSourceSplitter"
James Dong [Tue, 6 Mar 2012 18:23:51 +0000 (10:23 -0800)]
Merge "There was copy and paste code in JNI to create a DrmConvertedStatus object."
Siva Velusamy [Tue, 6 Mar 2012 16:59:32 +0000 (08:59 -0800)]
Merge "gltrace: Send vertex attribute data after glDraw() call."
Alex Sakhartchouk [Tue, 6 Mar 2012 16:31:54 +0000 (08:31 -0800)]
Merge "First draft of the sample function implementation."
Glenn Kasten [Tue, 6 Mar 2012 16:17:43 +0000 (08:17 -0800)]
Merge "Remove obsolete references to sched_policy.h"
Glenn Kasten [Tue, 6 Mar 2012 16:17:20 +0000 (08:17 -0800)]
Merge "Remove references to sched_policy.h"
Derek Sollenberger [Tue, 6 Mar 2012 13:27:31 +0000 (05:27 -0800)]
Merge "Add missing includes for Mutex.h"
Daniel Sandler [Tue, 6 Mar 2012 13:18:08 +0000 (05:18 -0800)]
Merge changes I8343449c,I4eaf69a1
* changes:
New slide-out mechanism.
Newly reimplemented PhoneStatusBar, now with fewer windows.
Jeff Brown [Tue, 6 Mar 2012 04:38:12 +0000 (20:38 -0800)]
Merge "Rename remove callback methods."
Mathias Agopian [Tue, 6 Mar 2012 03:41:29 +0000 (19:41 -0800)]
Merge "Add ATRACEs for Buffer indices"
Jeff Brown [Tue, 6 Mar 2012 03:05:02 +0000 (19:05 -0800)]
Merge "Support posting delayed animation/draw callbacks."
Glenn Kasten [Tue, 6 Mar 2012 02:12:45 +0000 (18:12 -0800)]
Remove obsolete references to sched_policy.h
As part of scheduling policy cleanup, remove or isolate
all references to the scheduling policy APIs.
Change-Id: Ia1ea2fe711a399039f25217309e061267744b856
Mathias Agopian [Tue, 6 Mar 2012 00:08:26 +0000 (16:08 -0800)]
Merge "fixup include paths"
Mathias Agopian [Mon, 5 Mar 2012 21:57:02 +0000 (13:57 -0800)]
fixup include paths
- remove unneeded include deps
- remove some hardcoded include paths
Change-Id: Ifae0e2b2d738e0f94f8525c45be78f4227ce1673
Nick Pelly [Mon, 5 Mar 2012 23:57:13 +0000 (15:57 -0800)]
Merge "Clarify docs for the thread used in BroadcastReceiver.onReceive()"
Jeff Brown [Mon, 5 Mar 2012 23:38:47 +0000 (15:38 -0800)]
Merge "Change widgets to post invalidate to the animation timer."
Guang Zhu [Mon, 5 Mar 2012 23:35:27 +0000 (15:35 -0800)]
Merge "Update to DumpRenderTree test harness"
Gilles Debunne [Mon, 5 Mar 2012 23:22:28 +0000 (15:22 -0800)]
Merge "EditText caches only text in its internal display list."
Eric Fischer [Mon, 5 Mar 2012 23:18:30 +0000 (15:18 -0800)]
Merge "Import translations. DO NOT MERGE"
Eric Fischer [Mon, 5 Mar 2012 23:18:20 +0000 (15:18 -0800)]
Merge "Import translations. DO NOT MERGE"
Jean-Michel Trivi [Mon, 5 Mar 2012 22:51:54 +0000 (14:51 -0800)]
Merge "Add channel mask in AudioSink"
Tom Taylor [Mon, 5 Mar 2012 22:47:27 +0000 (14:47 -0800)]
Merge "Remove deleted pdu items from the updated cache"
Scott Main [Mon, 5 Mar 2012 22:43:11 +0000 (14:43 -0800)]
am
5186f094: am
8b0f6881: am
a47d88a7: docs: dashboard update for march 5
* commit '
5186f094ba6d37f47ae52085e34dd87267ec41d4':
docs: dashboard update for march 5
Fabrice Di Meglio [Mon, 5 Mar 2012 22:40:50 +0000 (14:40 -0800)]
Merge "Fix bug #
5815381 [DA] [Android Gallery] [Cut string in "no-response" box]"
Scott Main [Mon, 5 Mar 2012 22:39:46 +0000 (14:39 -0800)]
am
8b0f6881: am
a47d88a7: docs: dashboard update for march 5
* commit '
8b0f688156919cec527bc60df43c527d2dd940dc':
docs: dashboard update for march 5
Scott Main [Mon, 5 Mar 2012 22:36:05 +0000 (14:36 -0800)]
am
a47d88a7: docs: dashboard update for march 5
* commit '
a47d88a7d25da74319dc3decf80d98516a85fab2':
docs: dashboard update for march 5
Jim Miller [Mon, 5 Mar 2012 21:50:48 +0000 (13:50 -0800)]
Merge "Fix
5958806: Allow play button to be hidden in TransportControlView"
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."