OSDN Git Service
Gilles Debunne [Tue, 24 Jan 2012 18:46:58 +0000 (10:46 -0800)]
Merge "Fix for AOOB in MeasuredText"
Gilles Debunne [Tue, 24 Jan 2012 18:42:09 +0000 (10:42 -0800)]
Merge "Restored selectAllOnFocus"
Jean-Baptiste Queru [Tue, 24 Jan 2012 16:46:26 +0000 (08:46 -0800)]
am
10c4641c: am
2ae5805c: am
164a9842: Merge "stagefright aacenc: Properly terminate a comment"
* commit '
10c4641c2e2f747f8fef7d217d550b7f9a6de588':
stagefright aacenc: Properly terminate a comment
Jean-Baptiste Queru [Tue, 24 Jan 2012 16:43:14 +0000 (08:43 -0800)]
am
2ae5805c: am
164a9842: Merge "stagefright aacenc: Properly terminate a comment"
* commit '
2ae5805cf18ad6bdbea5def03a488e14c1a8804c':
stagefright aacenc: Properly terminate a comment
Jean-Baptiste Queru [Tue, 24 Jan 2012 16:40:50 +0000 (08:40 -0800)]
am
164a9842: Merge "stagefright aacenc: Properly terminate a comment"
* commit '
164a984224f5d430757628028f2522329987350f':
stagefright aacenc: Properly terminate a comment
Jean-Baptiste Queru [Tue, 24 Jan 2012 15:51:11 +0000 (07:51 -0800)]
Merge "stagefright aacenc: Properly terminate a comment"
Adam Cohen [Tue, 24 Jan 2012 03:23:06 +0000 (19:23 -0800)]
Merge "Fix issue
5905210, AdapterViewAnimator sending negative index to Adapter"
Fabrice Di Meglio [Tue, 24 Jan 2012 02:59:17 +0000 (18:59 -0800)]
Merge "Fix bug #
5863709 API request: Change param names of deleteSurroundingText to "before" and "after""
Chia-chi Yeh [Tue, 24 Jan 2012 02:40:52 +0000 (18:40 -0800)]
Merge "VpnDialogs: fix screen flickering when popping up dialogs."
Jeff Brown [Tue, 24 Jan 2012 01:36:06 +0000 (17:36 -0800)]
Merge "Inform ContentObservers about the changed content Uri."
Jeff Brown [Tue, 24 Jan 2012 01:35:50 +0000 (17:35 -0800)]
Merge "Clean up content observer code."
Romain Guy [Tue, 24 Jan 2012 01:10:42 +0000 (17:10 -0800)]
Merge "Add full support for Canvas.setDrawFilter()"
Romain Guy [Tue, 24 Jan 2012 00:27:50 +0000 (16:27 -0800)]
Merge "Update hardware acceleration doc"
Jim Miller [Mon, 23 Jan 2012 23:53:17 +0000 (15:53 -0800)]
am
9f080e2a: am
44760b10: Merge "Revert "Fix
5797764: Increase lock screen\'s thread priority"" into ics-mr1
* commit '
9f080e2a5bc6a268934e32201c69ea8a86900396':
Revert "Fix
5797764: Increase lock screen's thread priority"
Jim Miller [Mon, 23 Jan 2012 23:51:23 +0000 (15:51 -0800)]
am
44760b10: Merge "Revert "Fix
5797764: Increase lock screen\'s thread priority"" into ics-mr1
* commit '
44760b106a4bafcf83fb356bf91683db40e0e5a2':
Revert "Fix
5797764: Increase lock screen's thread priority"
Jim Miller [Mon, 23 Jan 2012 23:49:32 +0000 (15:49 -0800)]
Merge "Revert "Fix
5797764: Increase lock screen's thread priority"" into ics-mr1
Fabrice Di Meglio [Mon, 23 Jan 2012 23:46:58 +0000 (15:46 -0800)]
Merge "Fix bug #
5846413 "phone" keyboard layout is broken on master"
Romain Guy [Mon, 23 Jan 2012 23:35:24 +0000 (15:35 -0800)]
Merge "Fix API typo"
Justin Ho [Mon, 23 Jan 2012 23:16:00 +0000 (15:16 -0800)]
am
feb1d988: (-s ours) am
fee5a860: Merge "DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"" into ics-mr1
* commit '
feb1d988c8ea1a67a4edbf1914ea41ea73519e12':
DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"
Justin Ho [Mon, 23 Jan 2012 23:13:19 +0000 (15:13 -0800)]
am
fee5a860: Merge "DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"" into ics-mr1
* commit '
fee5a860a8355cda071ff23644e943414ba7f65d':
DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"
Justin Ho [Mon, 23 Jan 2012 23:11:00 +0000 (15:11 -0800)]
Merge "DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"" into ics-mr1
John Reck [Mon, 23 Jan 2012 23:04:13 +0000 (15:04 -0800)]
Merge "Fix crash when scrolling a layer"
Dianne Hackborn [Mon, 23 Jan 2012 22:34:55 +0000 (14:34 -0800)]
Merge "New screen rotation animation design."
Gilles Debunne [Mon, 23 Jan 2012 22:10:44 +0000 (14:10 -0800)]
Merge "Double tap to select enabled on suggestions"
Dianne Hackborn [Mon, 23 Jan 2012 20:36:19 +0000 (12:36 -0800)]
Merge "New brightness setting to adjust auto-brightness mode."
Wink Saville [Mon, 23 Jan 2012 20:22:21 +0000 (12:22 -0800)]
Merge "Do not clear good TLVs when a error occurs decoding."
Andy McFadden [Mon, 23 Jan 2012 20:21:19 +0000 (12:21 -0800)]
Merge "Don't use bootstrap loader directly"
Bill Gruber [Mon, 23 Jan 2012 18:41:43 +0000 (10:41 -0800)]
am
add87f99: am
5e5b57ae: Merge "DevDocs update: Publishing on Market" into ics-mr1
* commit '
add87f99d9ece26c776abe40297e9a49e08932d9':
DevDocs update: Publishing on Market
The Android Open Source Project [Mon, 23 Jan 2012 18:41:37 +0000 (10:41 -0800)]
am
961b1df3: Reconcile with ics-mr1-release
* commit '
961b1df3fcbf5c441555b69ac52a5aed7f91a94e':
Fix
5797764: Increase lock screen's thread priority
Bill Gruber [Mon, 23 Jan 2012 18:23:10 +0000 (10:23 -0800)]
am
5e5b57ae: Merge "DevDocs update: Publishing on Market" into ics-mr1
* commit '
5e5b57aef29b33d03965b4dc370cde9a39220adc':
DevDocs update: Publishing on Market
Bill Gruber [Mon, 23 Jan 2012 18:21:16 +0000 (10:21 -0800)]
Merge "DevDocs update: Publishing on Market" into ics-mr1
The Android Open Source Project [Mon, 23 Jan 2012 18:15:41 +0000 (10:15 -0800)]
Reconcile with ics-mr1-release
Change-Id: If1b58550b6ddf90a654f08e4add9012a15a7134a
Andy McFadden [Mon, 23 Jan 2012 17:34:17 +0000 (09:34 -0800)]
Merge "Use Map.Entry, not HashMap.Entry"
Jim Miller [Mon, 23 Jan 2012 17:18:36 +0000 (09:18 -0800)]
am
b1c7785c: am
eaa11a72: Merge "Fix
5797764: Increase lock screen\'s thread priority" into ics-mr1
* commit '
b1c7785c1110e171d3dd3deb259b1caeed0b9da6':
Fix
5797764: Increase lock screen's thread priority
Justin Ho [Mon, 23 Jan 2012 17:18:30 +0000 (09:18 -0800)]
am
e46f8696: am
b09f6f96: Merge "Update WiMAX assets to match new style Bug:
5724605" into ics-mr1
* commit '
e46f869629ef27afb149c771e69dbbefe1135f33':
Update WiMAX assets to match new style Bug:
5724605
Daniel Sandler [Mon, 23 Jan 2012 17:18:24 +0000 (09:18 -0800)]
am
aaa7b772: am
639ed754: Hide mobile RSSI on devices without mobile data.
* commit '
aaa7b7728f3ced062273b54e1fc3b9d7d815bdcd':
Hide mobile RSSI on devices without mobile data.
Justin Ho [Mon, 23 Jan 2012 17:18:20 +0000 (09:18 -0800)]
am
ffb0c0b3: am
70e21c92: Merge "New out-of-service RSSI." into ics-mr1
* commit '
ffb0c0b3ca2f8693a354aad17e21f1419d9f0379':
New out-of-service RSSI.
George Mount [Mon, 23 Jan 2012 15:30:26 +0000 (07:30 -0800)]
Merge "Add cut and paste to ContentEditable."
Michael Jurka [Mon, 23 Jan 2012 15:24:32 +0000 (07:24 -0800)]
Merge "Remove fastInvalidate and setFast* methods"
Michael Jurka [Mon, 23 Jan 2012 15:23:56 +0000 (07:23 -0800)]
Merge "Improve rapid-fire presses on system bar"
Dianne Hackborn [Sat, 21 Jan 2012 02:42:07 +0000 (18:42 -0800)]
resolved conflicts for merge of
892d11f4 to master
Change-Id: I21eca0002100d898e167a25aaa46d896deca2a11
Christopher Tate [Sat, 21 Jan 2012 01:59:06 +0000 (17:59 -0800)]
Merge "Fix shared-storage full backup"
Glenn Kasten [Sat, 21 Jan 2012 01:16:36 +0000 (17:16 -0800)]
Merge "Remove AudioFlinger dependencies on client"
Guang Zhu [Sat, 21 Jan 2012 01:06:42 +0000 (17:06 -0800)]
Merge "Revert "Use port 18000 instead of 8000 for layout tests""
Daniel Sandler [Sat, 21 Jan 2012 00:38:24 +0000 (16:38 -0800)]
am
a64f899f: am
4d3161f3: Merge "Always show appropriate mobile service label." into ics-mr1
* commit '
a64f899fa6159a8839a769d3f107f6c502da58c8':
Always show appropriate mobile service label.
Jeff Brown [Sat, 21 Jan 2012 00:38:10 +0000 (16:38 -0800)]
am
1bc82792: (-s ours) am
ad1f4a2c: Merge "Implement a max time bound for rotation. (DO NOT MERGE)" into ics-mr1
* commit '
1bc82792b87c0aee65c53f84a6d7c6b5031a09bc':
Implement a max time bound for rotation. (DO NOT MERGE)
Jeff Brown [Sat, 21 Jan 2012 00:38:07 +0000 (16:38 -0800)]
am
06a0fb95: (-s ours) am
5d58eb06: Merge "Fix a few memory leaks in the input dispatcher. (DO NOT MERGE)" into ics-mr1
* commit '
06a0fb953ff1c544bdbef2618d20ec1ba551eb6e':
Fix a few memory leaks in the input dispatcher. (DO NOT MERGE)
The Android Open Source Project [Sat, 21 Jan 2012 00:38:02 +0000 (16:38 -0800)]
am
288cde7f: Reconcile with ics-mr1-release
* commit '
288cde7f0a17f47f7071168f442d19f703947cc9':
Jean-Baptiste Queru [Sat, 21 Jan 2012 00:37:52 +0000 (16:37 -0800)]
am
ee567e08: am
c3c36b4f: am
9d25b82d: Merge "Rename LOG_ASSERT to ALOG_ASSERT"
* commit '
ee567e08d973c0fad214889e8d980f9bfb535b34':
Rename LOG_ASSERT to ALOG_ASSERT
Jean-Baptiste Queru [Sat, 21 Jan 2012 00:37:49 +0000 (16:37 -0800)]
am
45470559: (-s ours) am
12b7da69: am
6df477be: Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)"
* commit '
45470559cd4a499fd5d38cf708f0b531dc081fed':
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
Jean-Baptiste Queru [Sat, 21 Jan 2012 00:35:20 +0000 (16:35 -0800)]
am
db2b3930: (-s ours) am
f3f650db: am
a826f9e2: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)"
* commit '
db2b39300a8f763cf2d0c9808deb86db87d5492c':
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
Jean-Baptiste Queru [Sat, 21 Jan 2012 00:32:45 +0000 (16:32 -0800)]
am
dde686e2: (-s ours) am
08d3c6e5: am
4f367f33: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)"
* commit '
dde686e2bdf7ea679dae4fd4edbf94c71802dc28':
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
Jean-Baptiste Queru [Sat, 21 Jan 2012 00:30:21 +0000 (16:30 -0800)]
am
a1e87397: (-s ours) am
7ae84204: am
ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)"
* commit '
a1e873975704814416ee4d5023bf0740ec195ec0':
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
Jean-Baptiste Queru [Sat, 21 Jan 2012 00:28:04 +0000 (16:28 -0800)]
am
d6b5584b: (-s ours) am
97aa8ee8: Merge
ee4618bc
* commit '
d6b5584b67f8a2f3d8ea20d748652673d5761e33':
Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)
Jean-Baptiste Queru [Sat, 21 Jan 2012 00:25:45 +0000 (16:25 -0800)]
am
fd266b36: (-s ours) am
36b48c30: am
c318bbb0: Merge "Rename (IF_)LOG() to (IF_)ALOG()"
* commit '
fd266b36826aa6dd8cd3fa00c159a094423899fb':
Rename (IF_)LOG() to (IF_)ALOG()
Justin Ho [Sat, 21 Jan 2012 00:23:03 +0000 (16:23 -0800)]
am
abc90a7b: (-s ours) am
820b45c0: Merge "DO NOT MERGE Revert "Fix issue #
5823276: home repaints after full-screen app is exited"" into ics-mr1
* commit '
abc90a7b48b058379a50a426bd0d2769ac7229b6':
DO NOT MERGE Revert "Fix issue #
5823276: home repaints after full-screen app is exited"
Jeff Brown [Sat, 21 Jan 2012 00:20:24 +0000 (16:20 -0800)]
Merge "Delete dead code."
The Android Automerger [Sat, 21 Jan 2012 00:12:47 +0000 (16:12 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Wink Saville [Fri, 20 Jan 2012 23:56:56 +0000 (15:56 -0800)]
Merge "Additional logging information for Card Application Toolkit/SIM Toolkit"
Robert Ly [Fri, 20 Jan 2012 23:52:32 +0000 (15:52 -0800)]
am
cdc1ea03: am
4e552533: resolved conflicts for merge of
b078d942 to ics-mr1
* commit '
cdc1ea03130763963fe6c179ed1f5ec14d6c7750':
cherrypick from master docs: Renderscript changes Change-Id: Ic84b7d8c5c48e118f337e60c8bb5b8bc68b0da16
The Android Open Source Project [Fri, 20 Jan 2012 23:52:27 +0000 (15:52 -0800)]
am
5d0c713a: Reconcile with ics-mr1-release
* commit '
5d0c713a87e9fd3cc7a775092aef9fc1194c7440':
Robert Ly [Fri, 20 Jan 2012 23:52:07 +0000 (15:52 -0800)]
am
ab8f1ba0: am
12310ee8: am
9575a1ab: Merge "docs: wifi direct" into ics-mr0
* commit '
ab8f1ba0ec9d66db2f653b08f4caa24a27b3a996':
docs: wifi direct
Jim Miller [Fri, 20 Jan 2012 23:48:21 +0000 (15:48 -0800)]
am
ab9601cd: am
230a7092: Merge "Fix
5863053: Add method to lock screen immediately." into ics-mr1
* commit '
ab9601cdbb95ae94088750eff9a926a572c1a4d6':
Fix
5863053: Add method to lock screen immediately.
Jim Miller [Fri, 20 Jan 2012 23:26:42 +0000 (15:26 -0800)]
am
eaa11a72: Merge "Fix
5797764: Increase lock screen\'s thread priority" into ics-mr1
* commit '
eaa11a723150f1ea79446d7ba4bf77eb47b73337':
Fix
5797764: Increase lock screen's thread priority
Jim Miller [Fri, 20 Jan 2012 23:24:20 +0000 (15:24 -0800)]
Merge "Fix
5797764: Increase lock screen's thread priority" into ics-mr1
Glenn Kasten [Fri, 20 Jan 2012 23:06:01 +0000 (15:06 -0800)]
Merge "Fix warning for redundant typedef"
Justin Ho [Fri, 20 Jan 2012 22:50:30 +0000 (14:50 -0800)]
am
b09f6f96: Merge "Update WiMAX assets to match new style Bug:
5724605" into ics-mr1
* commit '
b09f6f96e3583da320b69486869bc98fd463735e':
Update WiMAX assets to match new style Bug:
5724605
Justin Ho [Fri, 20 Jan 2012 22:48:51 +0000 (14:48 -0800)]
Merge "Update WiMAX assets to match new style Bug:
5724605" into ics-mr1
Daniel Sandler [Fri, 20 Jan 2012 22:40:26 +0000 (14:40 -0800)]
am
639ed754: Hide mobile RSSI on devices without mobile data.
* commit '
639ed754bba866d2a47ef7ca58e56806b546b149':
Hide mobile RSSI on devices without mobile data.
Robert Greenwalt [Fri, 20 Jan 2012 22:35:41 +0000 (14:35 -0800)]
Merge "Stop using shared DUN APN when tethering stops."
Justin Ho [Fri, 20 Jan 2012 22:35:09 +0000 (14:35 -0800)]
am
70e21c92: Merge "New out-of-service RSSI." into ics-mr1
* commit '
70e21c927afeff05d8f26e9df2f36785ca19fdfd':
New out-of-service RSSI.
Justin Ho [Fri, 20 Jan 2012 22:33:07 +0000 (14:33 -0800)]
Merge "New out-of-service RSSI." into ics-mr1
Eino-Ville Talvala [Fri, 20 Jan 2012 22:32:22 +0000 (14:32 -0800)]
Merge "Add ANativeWindow timestamp support to camera service."
Robert Greenwalt [Fri, 20 Jan 2012 22:24:15 +0000 (14:24 -0800)]
Merge "Log netd traffic nicely."
Jeff Brown [Fri, 20 Jan 2012 22:07:59 +0000 (14:07 -0800)]
Merge "Initialize SQLite as part of the android runtime."
Gilles Debunne [Fri, 20 Jan 2012 22:06:19 +0000 (14:06 -0800)]
Merge "Touch moves cursor in text refactored"
Andreas Huber [Fri, 20 Jan 2012 21:43:39 +0000 (13:43 -0800)]
Merge "Starhub RTSP apparently does not establish time on all tracks"
Glenn Kasten [Fri, 20 Jan 2012 20:16:06 +0000 (12:16 -0800)]
Merge "Fix typos in string constants"
Glenn Kasten [Fri, 20 Jan 2012 20:15:38 +0000 (12:15 -0800)]
Merge "Remove dead file include/media/thread_init.h"
Glenn Kasten [Fri, 20 Jan 2012 20:14:32 +0000 (12:14 -0800)]
Merge "Remove redundant get()"
Dianne Hackborn [Fri, 20 Jan 2012 20:03:47 +0000 (12:03 -0800)]
am
1bae8066: Merge "Fix issue #
5823276 again: home repaints after full-screen app is exited" into ics-mr1
* commit '
1bae80668cc1d12bb4a4b93bce1960b2601de131':
Fix issue #
5823276 again: home repaints after full-screen app is exited
Dianne Hackborn [Fri, 20 Jan 2012 20:01:51 +0000 (12:01 -0800)]
Merge "Fix issue #
5823276 again: home repaints after full-screen app is exited" into ics-mr1
Glenn Kasten [Fri, 20 Jan 2012 19:49:04 +0000 (11:49 -0800)]
Merge "Move memcpy_to_i16_from_u8 to audio_utils"
Daniel Sandler [Fri, 20 Jan 2012 19:31:10 +0000 (11:31 -0800)]
am
4d3161f3: Merge "Always show appropriate mobile service label." into ics-mr1
* commit '
4d3161f379195302b720e120c5e6b65a0adfaf8c':
Always show appropriate mobile service label.
Daniel Sandler [Fri, 20 Jan 2012 19:28:44 +0000 (11:28 -0800)]
Merge "Always show appropriate mobile service label." into ics-mr1
Jeff Brown [Fri, 20 Jan 2012 19:26:46 +0000 (11:26 -0800)]
am
ad1f4a2c: Merge "Implement a max time bound for rotation. (DO NOT MERGE)" into ics-mr1
* commit '
ad1f4a2ca825b8524c6bed494a7cf3ca70ee7e28':
Implement a max time bound for rotation. (DO NOT MERGE)
Jeff Brown [Fri, 20 Jan 2012 19:26:43 +0000 (11:26 -0800)]
am
5d58eb06: Merge "Fix a few memory leaks in the input dispatcher. (DO NOT MERGE)" into ics-mr1
* commit '
5d58eb06bcc8671bae72fb2389a9929e106131cc':
Fix a few memory leaks in the input dispatcher. (DO NOT MERGE)
Jeff Brown [Fri, 20 Jan 2012 19:24:13 +0000 (11:24 -0800)]
Merge "Implement a max time bound for rotation. (DO NOT MERGE)" into ics-mr1
Jeff Brown [Fri, 20 Jan 2012 19:24:01 +0000 (11:24 -0800)]
Merge "Fix a few memory leaks in the input dispatcher. (DO NOT MERGE)" into ics-mr1
Gilles Debunne [Fri, 20 Jan 2012 18:27:10 +0000 (10:27 -0800)]
Merge "AOOB in AutoComplete"
Gilles Debunne [Fri, 20 Jan 2012 18:27:00 +0000 (10:27 -0800)]
Merge "Make sure text selection always starts"
The Android Open Source Project [Fri, 20 Jan 2012 18:25:28 +0000 (10:25 -0800)]
Reconcile with ics-mr1-release
Change-Id: I97a21a76245bb9212aab17c3e3c4856963d64b6c
Glenn Kasten [Fri, 20 Jan 2012 18:07:06 +0000 (10:07 -0800)]
Merge "Remove dead setRingerMode(mode, mask)"
Glenn Kasten [Fri, 20 Jan 2012 16:32:45 +0000 (08:32 -0800)]
Merge "Fix build warning for void * arithmetic"
Pin Ting [Fri, 20 Jan 2012 09:37:12 +0000 (01:37 -0800)]
Merge "Fixes some javadoc."
Jeff Brown [Fri, 20 Jan 2012 03:54:16 +0000 (19:54 -0800)]
Merge "Don't need to link to libsqlite from media JNI library."
Jeff Brown [Fri, 20 Jan 2012 03:54:05 +0000 (19:54 -0800)]
Merge "Clean up SQLiteDebug natives."
Jeff Brown [Fri, 20 Jan 2012 03:53:38 +0000 (19:53 -0800)]
Merge "Remove custom SQLITE_UNCLOSED error code."
James Dong [Fri, 20 Jan 2012 02:53:27 +0000 (18:53 -0800)]
Merge "Remove obsolete TODO comments"
Romain Guy [Fri, 20 Jan 2012 02:16:11 +0000 (18:16 -0800)]
Merge "Fix build"