OSDN Git Service
The Android Open Source Project [Fri, 20 Jan 2012 23:56:52 +0000 (15:56 -0800)]
Robert Ly [Fri, 20 Jan 2012 23:56:44 +0000 (15:56 -0800)]
am
a551feef: am
ab8f1ba0: am
12310ee8: am
9575a1ab: Merge "docs: wifi direct" into ics-mr0
* commit '
a551feefa57ea28146a2493778815f5402eb6e58':
docs: wifi direct
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:51:02 +0000 (15:51 -0800)]
am
d3fe9abf: am
ab9601cd: am
230a7092: Merge "Fix
5863053: Add method to lock screen immediately." into ics-mr1
* commit '
d3fe9abfb9a6a21a18abde6a98dceb423c04ebef':
Fix
5863053: Add method to lock screen immediately.
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.
Glenn Kasten [Fri, 20 Jan 2012 23:08:00 +0000 (15:08 -0800)]
am
865534a0: Merge "Fix warning for redundant typedef"
* commit '
865534a0e30982b0e669006509b9590fad129295':
Fix warning for redundant typedef
Glenn Kasten [Fri, 20 Jan 2012 23:06:01 +0000 (15:06 -0800)]
Merge "Fix warning for redundant typedef"
Alex Sakhartchouk [Fri, 20 Jan 2012 23:05:22 +0000 (15:05 -0800)]
Merge "Refactoring out some params code." into graphics-dev
Glenn Kasten [Fri, 20 Jan 2012 22:52:03 +0000 (14:52 -0800)]
am
0a204ed0: Use audio_format_t consistently, continued
* commit '
0a204ed0f58a9baaac5630864cd75495486c6cbe':
Use audio_format_t consistently, continued
Robert Greenwalt [Fri, 20 Jan 2012 22:37:24 +0000 (14:37 -0800)]
am
2772143e: Merge "Stop using shared DUN APN when tethering stops."
* commit '
2772143eff6a69ae7182e0c2628809d8dbd8d355':
Stop using shared DUN APN when tethering stops.
Robert Greenwalt [Fri, 20 Jan 2012 22:35:41 +0000 (14:35 -0800)]
Merge "Stop using shared DUN APN when tethering stops."
Eino-Ville Talvala [Fri, 20 Jan 2012 22:35:16 +0000 (14:35 -0800)]
am
59734cb7: Merge "Add ANativeWindow timestamp support to camera service."
* commit '
59734cb7cae326d0c1f06de59ad1768cacaf7a6d':
Add ANativeWindow timestamp support to camera service.
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:27:03 +0000 (14:27 -0800)]
am
67d853b6: Merge "Log netd traffic nicely."
* commit '
67d853b61a2d077d51545c480206b1873c74ea46':
Log netd traffic nicely.
Robert Greenwalt [Fri, 20 Jan 2012 22:24:15 +0000 (14:24 -0800)]
Merge "Log netd traffic nicely."
Alex Sakhartchouk [Fri, 20 Jan 2012 22:22:48 +0000 (14:22 -0800)]
Merge "Many optimizations of rendering path. Adding ability to split up per shader and per object updates. Added cubemaps as scenegraph objects." into graphics-dev
Jeff Brown [Fri, 20 Jan 2012 22:14:22 +0000 (14:14 -0800)]
am
1bf599a0: Merge "Initialize SQLite as part of the android runtime."
* commit '
1bf599a01e7ad720150d8cc12416ba67bebd74c9':
Initialize SQLite as part of the android runtime.
Gilles Debunne [Fri, 20 Jan 2012 22:14:19 +0000 (14:14 -0800)]
am
2f9510ca: Merge "Touch moves cursor in text refactored"
* commit '
2f9510ca50b0fd2925bc7e349f76136ed403a386':
Touch moves cursor in text refactored
Andreas Huber [Fri, 20 Jan 2012 22:14:15 +0000 (14:14 -0800)]
am
e8bb6fef: Merge "Starhub RTSP apparently does not establish time on all tracks"
* commit '
e8bb6fef58dfa94346d8a72c1eb9046d5d1f2da1':
Starhub RTSP apparently does not establish time on all tracks
Glenn Kasten [Fri, 20 Jan 2012 22:14:07 +0000 (14:14 -0800)]
am
c79e4139: Merge "Fix typos in string constants"
* commit '
c79e413911d48ebf14621304655029f6cd2c7959':
Fix typos in string constants
Glenn Kasten [Fri, 20 Jan 2012 22:14:04 +0000 (14:14 -0800)]
am
15f51cce: Merge "Remove dead file include/media/thread_init.h"
* commit '
15f51ccee1fb4aaf9296998e68156903f0657098':
Remove dead file include/media/thread_init.h
Glenn Kasten [Fri, 20 Jan 2012 22:14:02 +0000 (14:14 -0800)]
am
ea46649a: Merge "Remove redundant get()"
* commit '
ea46649a1cce7447ece812e60168f2bb3db47122':
Remove redundant get()
Glenn Kasten [Fri, 20 Jan 2012 22:13:41 +0000 (14:13 -0800)]
am
5ecff094: Merge "Move memcpy_to_i16_from_u8 to audio_utils"
* commit '
5ecff094f4df499f997bc9406c6e1a76a899aa12':
Move memcpy_to_i16_from_u8 to audio_utils
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()"
Glenn Kasten [Fri, 20 Jan 2012 19:49:04 +0000 (11:49 -0800)]
Merge "Move memcpy_to_i16_from_u8 to audio_utils"
Gilles Debunne [Fri, 20 Jan 2012 18:28:56 +0000 (10:28 -0800)]
am
1d98303a: Merge "AOOB in AutoComplete"
* commit '
1d98303ab6141af57dc841115486d9795fc94d02':
AOOB in AutoComplete
Gilles Debunne [Fri, 20 Jan 2012 18:28:53 +0000 (10:28 -0800)]
am
7418c35d: Merge "Make sure text selection always starts"
* commit '
7418c35d80e3462fe6f80ed1394e2d31c8b1b6bf':
Make sure text selection always starts
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"
Glenn Kasten [Fri, 20 Jan 2012 18:09:09 +0000 (10:09 -0800)]
am
7524a592: Merge "Remove dead setRingerMode(mode, mask)"
* commit '
7524a592526a14d20ec3f3acffd61fe18afaa4b4':
Remove dead setRingerMode(mode, mask)
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:34:40 +0000 (08:34 -0800)]
am
1b4d6049: Merge "Fix build warning for void * arithmetic"
* commit '
1b4d60497c6c89ae1457e802446c83ca7c8c0017':
Fix build warning for void * arithmetic
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:39:40 +0000 (01:39 -0800)]
am
f17e7c27: Merge "Fixes some javadoc."
* commit '
f17e7c272e27671d12fbf676d209f0a77f1acda1':
Fixes some javadoc.
Pin Ting [Fri, 20 Jan 2012 09:37:12 +0000 (01:37 -0800)]
Merge "Fixes some javadoc."
Jeff Brown [Fri, 20 Jan 2012 03:55:58 +0000 (19:55 -0800)]
am
8592baa3: Merge "Don\'t need to link to libsqlite from media JNI library."
* commit '
8592baa347f5874b4f36713b6ca2edcedbb3f071':
Don't need to link to libsqlite from media JNI library.
Jeff Brown [Fri, 20 Jan 2012 03:55:55 +0000 (19:55 -0800)]
am
46deab0a: Merge "Clean up SQLiteDebug natives."
* commit '
46deab0a694e7e3c79980904706a4d09bbda001a':
Clean up SQLiteDebug natives.
Jeff Brown [Fri, 20 Jan 2012 03:55:52 +0000 (19:55 -0800)]
am
b815d0f8: Merge "Remove custom SQLITE_UNCLOSED error code."
* commit '
b815d0f80ae58bc48008186d3919e7c6e51fb43e':
Remove custom SQLITE_UNCLOSED error code.
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:55:06 +0000 (18:55 -0800)]
am
20c53cb3: Merge "Remove obsolete TODO comments"
* commit '
20c53cb3aa8489c11004ac718c0891273391ac8c':
Remove obsolete TODO comments
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:36:34 +0000 (18:36 -0800)]
am
22d41843: Fix the build, for real
* commit '
22d418437e44587cb0fba4353515719453269189':
Fix the build, for real
Romain Guy [Fri, 20 Jan 2012 02:17:54 +0000 (18:17 -0800)]
Romain Guy [Fri, 20 Jan 2012 02:16:11 +0000 (18:16 -0800)]
Merge "Fix build"
Romain Guy [Fri, 20 Jan 2012 01:44:50 +0000 (17:44 -0800)]
am
d2f0dcd1: Merge "Remove unused code"
* commit '
d2f0dcd182fbc0423d206919e81f3845fb9b8155':
Remove unused code
Romain Guy [Fri, 20 Jan 2012 01:42:10 +0000 (17:42 -0800)]
Merge "Remove unused code"
Romain Guy [Fri, 20 Jan 2012 01:37:10 +0000 (17:37 -0800)]
am
bad12166: Merge "Deprecate unused APIs"
* commit '
bad12166190a7e8087eb5db0ae8df9a4e5843fde':
Deprecate unused APIs
Romain Guy [Fri, 20 Jan 2012 01:34:26 +0000 (17:34 -0800)]
Merge "Deprecate unused APIs"
Andreas Huber [Thu, 19 Jan 2012 22:42:10 +0000 (14:42 -0800)]
am
fa78fe0d: Merge "Make sure the ThrottledSource reports the proper mime type"
* commit '
fa78fe0d70fe7e6a9eb19680888b617ea57eaad4':
Make sure the ThrottledSource reports the proper mime type
Andreas Huber [Thu, 19 Jan 2012 22:40:44 +0000 (14:40 -0800)]
Merge "Make sure the ThrottledSource reports the proper mime type"
Jeff Brown [Thu, 19 Jan 2012 22:21:23 +0000 (14:21 -0800)]
am
a6885fa3: Merge "Remove no longer needed EventHub usleep() optimization."
* commit '
a6885fa366116c9dbc8ecba2abe32bf516912e8f':
Remove no longer needed EventHub usleep() optimization.
Jeff Brown [Thu, 19 Jan 2012 22:19:28 +0000 (14:19 -0800)]
Merge "Remove no longer needed EventHub usleep() optimization."
Jeff Brown [Thu, 19 Jan 2012 22:13:53 +0000 (14:13 -0800)]
am
ea33f4bc: Merge "Fix line wrapping."
* commit '
ea33f4bca5def40c75214dedb3ea63c70b2a462a':
Fix line wrapping.
Jeff Brown [Thu, 19 Jan 2012 22:11:47 +0000 (14:11 -0800)]
Merge "Fix line wrapping."
Jeff Brown [Thu, 19 Jan 2012 22:08:23 +0000 (14:08 -0800)]
am
3e8d7cfd: Merge "Clean up SQLite debugging code."
* commit '
3e8d7cfd1e6e65a60a9f6b7e174672dc9a281e49':
Clean up SQLite debugging code.
Jeff Brown [Thu, 19 Jan 2012 22:05:39 +0000 (14:05 -0800)]
Merge "Clean up SQLite debugging code."
Xavier Ducrohet [Thu, 19 Jan 2012 21:19:28 +0000 (13:19 -0800)]
am
cd836bbb: Merge "Fix broken drawCircle LayoutLib."
* commit '
cd836bbb8be8f4c93d6086a30da616c3b00f859e':
Fix broken drawCircle LayoutLib.
Xavier Ducrohet [Thu, 19 Jan 2012 21:17:43 +0000 (13:17 -0800)]
Merge "Fix broken drawCircle LayoutLib."
The Android Open Source Project [Thu, 19 Jan 2012 21:06:50 +0000 (13:06 -0800)]
Reconcile with ics-mr1-release
Change-Id: I151eb9ed3a43b1576a15e15b343832c8f9e9509b
Eric Laurent [Thu, 19 Jan 2012 18:54:03 +0000 (10:54 -0800)]
am
e988e0c3: Merge "resolved conflicts for merge of
05683c85 to master"
* commit '
e988e0c31ca16160dee1b7c689ac31cd70fe43a2':
AudioFlinger: mix track only when really ready (2)
Eric Laurent [Thu, 19 Jan 2012 18:52:46 +0000 (10:52 -0800)]
Merge "resolved conflicts for merge of
05683c85 to master"
Robert Ly [Thu, 19 Jan 2012 18:43:45 +0000 (10:43 -0800)]
am
12310ee8: am
9575a1ab: Merge "docs: wifi direct" into ics-mr0
* commit '
12310ee801553e63091ce3bda6f07a5be31a473c':
docs: wifi direct
Robert Ly [Thu, 19 Jan 2012 18:41:28 +0000 (10:41 -0800)]
am
9575a1ab: Merge "docs: wifi direct" into ics-mr0
* commit '
9575a1ab5d033248284d59b2a2ae6eda80f79762':
docs: wifi direct
Robert Ly [Thu, 19 Jan 2012 18:38:51 +0000 (10:38 -0800)]
Merge "docs: wifi direct" into ics-mr0
Gilles Debunne [Thu, 19 Jan 2012 18:24:59 +0000 (10:24 -0800)]
am
b3ca0fe6: Merge "Touch slop added to double tap detection"
* commit '
b3ca0fe66c1def11a04b18e6872318deb0340b9b':
Touch slop added to double tap detection
Gilles Debunne [Thu, 19 Jan 2012 18:24:57 +0000 (10:24 -0800)]
am
bdf7f965: Merge "Fixes around extract mode"
* commit '
bdf7f9658044d4c55c4826a88a41822045557ee5':
Fixes around extract mode
Gilles Debunne [Thu, 19 Jan 2012 18:23:32 +0000 (10:23 -0800)]
Merge "Touch slop added to double tap detection"
Gilles Debunne [Thu, 19 Jan 2012 18:23:18 +0000 (10:23 -0800)]
Merge "Fixes around extract mode"
Teng-Hui Zhu [Thu, 19 Jan 2012 18:03:07 +0000 (10:03 -0800)]
am
de9f0036: Merge "Support full screen back to back playing using javascript"
* commit '
de9f0036ef58a55ca89a3c427a462bd84b5751c3':
Support full screen back to back playing using javascript
Teng-Hui Zhu [Thu, 19 Jan 2012 18:00:40 +0000 (10:00 -0800)]
Merge "Support full screen back to back playing using javascript"
Eric Laurent [Thu, 19 Jan 2012 18:00:02 +0000 (10:00 -0800)]
resolved conflicts for merge of
05683c85 to master
Change-Id: I7846b7da8c5813b7a9b1f3f71aede0229689ff0d
Glenn Kasten [Thu, 19 Jan 2012 17:51:40 +0000 (09:51 -0800)]
am
00db1f52: Rename JNI implementation to match Java method
* commit '
00db1f52b1c12d3670a0419305aa7548f7932aa0':
Rename JNI implementation to match Java method
Glenn Kasten [Thu, 19 Jan 2012 14:13:00 +0000 (06:13 -0800)]
am
92ecdd63: Merge "Fix incorrect includes of AudioTrack.h"
* commit '
92ecdd63033a53b3c6301a9dc94c2438e498f27b':
Fix incorrect includes of AudioTrack.h
Glenn Kasten [Thu, 19 Jan 2012 14:10:48 +0000 (06:10 -0800)]
am
adf10837: Merge "Simplify range check for audio_mode_t (continued)"
* commit '
adf10837719627e725187e26a2e3654ba97245c8':
Simplify range check for audio_mode_t (continued)
Glenn Kasten [Thu, 19 Jan 2012 14:10:45 +0000 (06:10 -0800)]
am
6808516e: Merge "Add units to time periods"
* commit '
6808516e8e2327ddf4a6b2f3528d3a4d3ff105b3':
Add units to time periods
Glenn Kasten [Thu, 19 Jan 2012 14:10:42 +0000 (06:10 -0800)]
am
f4a93d09: Merge "Use const const strings for arrays and pointers to strings"
* commit '
f4a93d0965f5e4c6ea22798a83823174fa9f38eb':
Use const const strings for arrays and pointers to strings
Glenn Kasten [Thu, 19 Jan 2012 14:10:39 +0000 (06:10 -0800)]
am
0d7a9979: Merge "For booleans, use ! instead of == false"
* commit '
0d7a9979651511eb69bab14068fc0bee5d1a8441':
For booleans, use ! instead of == false
Glenn Kasten [Thu, 19 Jan 2012 14:10:37 +0000 (06:10 -0800)]
Merge "Fix incorrect includes of AudioTrack.h"
Glenn Kasten [Thu, 19 Jan 2012 14:10:36 +0000 (06:10 -0800)]
am
e119bd14: Merge "Replace run-time stream types by compile-time"
* commit '
e119bd144207b9b89ec7d52ee619bdbcda8ab497':
Replace run-time stream types by compile-time
Glenn Kasten [Thu, 19 Jan 2012 14:09:20 +0000 (06:09 -0800)]
Merge "Simplify range check for audio_mode_t (continued)"
Glenn Kasten [Thu, 19 Jan 2012 14:09:05 +0000 (06:09 -0800)]
Merge "Add units to time periods"
Glenn Kasten [Thu, 19 Jan 2012 14:08:53 +0000 (06:08 -0800)]
Merge "Use const const strings for arrays and pointers to strings"
Glenn Kasten [Thu, 19 Jan 2012 14:08:40 +0000 (06:08 -0800)]
Merge "For booleans, use ! instead of == false"
Glenn Kasten [Thu, 19 Jan 2012 14:08:12 +0000 (06:08 -0800)]
Merge "Replace run-time stream types by compile-time"
The Android Automerger [Thu, 19 Jan 2012 05:17:55 +0000 (21:17 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Jeff Brown [Thu, 19 Jan 2012 02:33:03 +0000 (18:33 -0800)]
am
6534c0e0: Merge "Fix issues with reentrant SQLite triggers."
* commit '
6534c0e0548332801cffaa0977af165025030297':
Fix issues with reentrant SQLite triggers.
Jeff Brown [Thu, 19 Jan 2012 02:31:06 +0000 (18:31 -0800)]
Merge "Fix issues with reentrant SQLite triggers."
Romain Guy [Thu, 19 Jan 2012 02:16:10 +0000 (18:16 -0800)]
am
a37a108c: Merge "Add basic code required for drawPicture()"
* commit '
a37a108cfbaa23bcddaaeab4b838bec262bc2441':
Add basic code required for drawPicture()
Romain Guy [Thu, 19 Jan 2012 02:14:27 +0000 (18:14 -0800)]
Merge "Add basic code required for drawPicture()"
Romain Guy [Thu, 19 Jan 2012 02:12:51 +0000 (18:12 -0800)]
am
e7bdf2d9: Merge "Don\'t crash on Canvas.drawPicture()"
* commit '
e7bdf2d9d0107afadddb6498331cd21be260d23c':
Don't crash on Canvas.drawPicture()
Romain Guy [Thu, 19 Jan 2012 02:11:09 +0000 (18:11 -0800)]
Merge "Don't crash on Canvas.drawPicture()"
Romain Guy [Thu, 19 Jan 2012 02:03:23 +0000 (18:03 -0800)]
am
4785a6ff: Merge "Full support for Canvas.drawPosText"
* commit '
4785a6ff8d48f51813611f2cab998b235ce2bbca':
Full support for Canvas.drawPosText