Chris Palmer
7c5c4e512b
am c5e2e26b: (-s ours) am 5bade703: Merge "DO NOT MERGE Correct the PackageManager.checkSignatures documentation." into gingerbread
...
Merge commit 'c5e2e26b9da40dc0941d0a6a33a82d8923924051'
* commit 'c5e2e26b9da40dc0941d0a6a33a82d8923924051':
DO NOT MERGE Correct the PackageManager.checkSignatures documentation.
2010-09-15 16:32:18 -07:00
Jim Miller
28be19cb98
Merge "Add new Carousel callbacks to RecentApplicationsActivity."
2010-09-15 14:53:05 -07:00
Paul Westbrook
33f4c675be
Merge "Enable downloads of https urls"
2010-09-15 14:23:28 -07:00
Makoto Onuki
8231fc9f9c
Merge "Add AbstractCursor.getNotificationUri."
2010-09-15 13:34:05 -07:00
Joe Onorato
b5d062e233
Merge "fix the build."
2010-09-15 12:36:21 -07:00
John Wang
ec921a5780
am 8028bd5b: am 6457a28b: Merge "Complete event registration in CallManager." into gingerbread
...
Merge commit '8028bd5b696fd94d33c905c4279d6505e985d70b'
* commit '8028bd5b696fd94d33c905c4279d6505e985d70b':
Complete event registration in CallManager.
2010-09-15 12:33:19 -07:00
Erik
50c9af2b4a
am 0b46070d: am 426ee7f2: Fixes some bugs in TimeZoneUtils
...
Merge commit '0b46070d8878a8791f343cbbe720388e7dfe4e6f'
* commit '0b46070d8878a8791f343cbbe720388e7dfe4e6f':
Fixes some bugs in TimeZoneUtils
2010-09-15 12:32:46 -07:00
Jeff Brown
dc543aec70
am 14bc6b5d: am 09340a4b: Merge "Replace epoll() with poll() and rename PollLoop to Looper." into gingerbread
...
Merge commit '14bc6b5d0677e5c454a67775c852f90389bb4567'
* commit '14bc6b5d0677e5c454a67775c852f90389bb4567':
Replace epoll() with poll() and rename PollLoop to Looper.
2010-09-15 12:32:29 -07:00
Mathias Agopian
c479e18db0
resolved conflicts for merge of 48a86240 to master
...
Change-Id: I2305fef9f4dd46183337217d822df3c675b6b6e5
2010-09-15 12:29:18 -07:00
jsh
ee6d0ecd57
am b30f2188: am 17fe229f: Merge "Unhide GsmCellLocation.getPsc()." into gingerbread
...
Merge commit 'b30f21882080bd4c0d7c3b25878151dd19ac3f94'
* commit 'b30f21882080bd4c0d7c3b25878151dd19ac3f94':
Unhide GsmCellLocation.getPsc().
2010-09-15 12:19:05 -07:00
Eric Laurent
37568e9fd2
am 23b8054e: am eea35ce8: Merge "Added intents for audio effects control application" into gingerbread
...
Merge commit '23b8054e85eaffa515c597e7b386e3892968302d'
* commit '23b8054e85eaffa515c597e7b386e3892968302d':
Added intents for audio effects control application
2010-09-15 11:39:09 -07:00
Dianne Hackborn
5b1a7245a3
am 227afd3a: am 1188f5e7: Merge "Fix problem where power manager was calling battery stats with bad wl type." into gingerbread
...
Merge commit '227afd3a1b1a32891e5e20c79fd98b2ccf982426'
* commit '227afd3a1b1a32891e5e20c79fd98b2ccf982426':
Fix problem where power manager was calling battery stats with bad wl type.
2010-09-15 11:38:47 -07:00
Erik
a9ae6b680a
am 86e19914: am b92788aa: Merge "Adds time zone functionality into fw as a hidden api" into gingerbread
...
Merge commit '86e1991428c2bc78354965c51b2821ae16f32a55'
* commit '86e1991428c2bc78354965c51b2821ae16f32a55':
Adds time zone functionality into fw as a hidden api
2010-09-15 11:38:26 -07:00
Dianne Hackborn
8346fa498a
am 264e7277: am 934516e1: Merge "Fix issue #2999795 : Runtime restart on Crespo" into gingerbread
...
Merge commit '264e727775728d0478fcb95855e8ea3801f34c8f'
* commit '264e727775728d0478fcb95855e8ea3801f34c8f':
Fix issue #2999795 : Runtime restart on Crespo
2010-09-15 11:38:02 -07:00
Brad Fitzpatrick
898171bbd3
am f26ac1f8: am 96d6c345: Merge "Unify some duplicate StrictMode-enabling code." into gingerbread
...
Merge commit 'f26ac1f8ed27d9e88bbde8978557c34788c7509c'
* commit 'f26ac1f8ed27d9e88bbde8978557c34788c7509c':
Unify some duplicate StrictMode-enabling code.
2010-09-15 11:37:54 -07:00
Brad Fitzpatrick
03b02e1d88
am 79cc46d1: am fb85bc66: Merge "Add missing wallpaper service lock." into gingerbread
...
Merge commit '79cc46d1b039fe6e16aa84b5f1e460afea52e672'
* commit '79cc46d1b039fe6e16aa84b5f1e460afea52e672':
Add missing wallpaper service lock.
2010-09-15 11:37:46 -07:00
Romain Guy
04c64dc3e5
am 282315e1: am 52e19d59: Merge "Change the keep alive time for excess idle threads." into gingerbread
...
Merge commit '282315e154b63a2eec84609600c81ad9e1c72994'
* commit '282315e154b63a2eec84609600c81ad9e1c72994':
Change the keep alive time for excess idle threads.
2010-09-15 11:37:37 -07:00
Brian Carlstrom
6bd6d21962
am e68f8b7e: am 405d4db5: Rename internal SSLParameters to SSLParametersImpl to avoid collision with new javax.net.ssl.SSLParameters
...
Merge commit 'e68f8b7ebe898ec06d7a156964d498e3d0a2e6c0'
* commit 'e68f8b7ebe898ec06d7a156964d498e3d0a2e6c0':
Rename internal SSLParameters to SSLParametersImpl to avoid collision with new javax.net.ssl.SSLParameters
2010-09-15 11:37:22 -07:00
Brian Carlstrom
7ea18cf23e
am 0535d857: am 94126238: Merge "Remove SSLContextImpl.engineInit(..) that takes persistent cache arguments" into gingerbread
...
Merge commit '0535d8577fb2a3687428f462c591ae3220e1f773'
* commit '0535d8577fb2a3687428f462c591ae3220e1f773':
Remove SSLContextImpl.engineInit(..) that takes persistent cache arguments
2010-09-15 11:36:58 -07:00
Daisuke Miyakawa
5f58195ad8
Merge "Take apart LocalePicker#onListItemClick() into two"
2010-09-15 10:54:42 -07:00
Jean-Baptiste Queru
18be7e2b79
Merge "Manage fonts like a true product definition"
2010-09-15 09:53:00 -07:00
Nipun Kwatra
38cdce629c
Merge "Disable shutter sound and play recording sound for still mode time lapse."
2010-09-15 09:18:30 -07:00
Leon Scroggins
7f710d0151
Merge "Exit action mode when destroying the WebView or loading."
2010-09-15 08:47:57 -07:00
Irfan Sheriff
4d66069f0f
Merge "Add per network static IP settings"
2010-09-15 08:31:03 -07:00
John Wang
825577f81b
am e92fdd26: am e7b92d7b: Merge "Return immutable copies of private callList." into gingerbread
...
Merge commit 'e92fdd261eed516a8821675ceca971d1c90d772b'
* commit 'e92fdd261eed516a8821675ceca971d1c90d772b':
Return immutable copies of private callList.
2010-09-15 07:09:00 -07:00
Leon Scroggins III
859c074c02
am 720d5985: am 901b7b9b: am ca8f3d04: Merge "Add an option to hide the Voice Search icon." into froyo
...
Merge commit '720d5985f5d31912c97b7e549230d241e58c1298'
* commit '720d5985f5d31912c97b7e549230d241e58c1298':
Add an option to hide the Voice Search icon.
2010-09-15 07:08:49 -07:00
Hung-ying Tyan
d0def4800f
am 188a8f1b: am 89a7180a: Merge "SipService: ignore connect event for non-active networks." into gingerbread
...
Merge commit '188a8f1b72452bc294daa2186e93771543be0478'
* commit '188a8f1b72452bc294daa2186e93771543be0478':
SipService: ignore connect event for non-active networks.
2010-09-15 07:08:38 -07:00
Dirk Dougherty
39f77068e7
am f9c7a3e2: am e71396cf: am 4b4af990: Doc change: update ADT 0.9.8 checksum and size.
...
Merge commit 'f9c7a3e25e6e83292051414246cb1fc0c5f85207'
* commit 'f9c7a3e25e6e83292051414246cb1fc0c5f85207':
Doc change: update ADT 0.9.8 checksum and size.
2010-09-15 07:08:23 -07:00
Kenny Root
be42f39a04
am 3ca26914: am 30434415: Merge "Dedupe timestamp in PackageSettings" into gingerbread
...
Merge commit '3ca2691446d333d52b1c0a39e6df74e03c2407cc'
* commit '3ca2691446d333d52b1c0a39e6df74e03c2407cc':
Dedupe timestamp in PackageSettings
2010-09-15 07:08:15 -07:00
Hung-ying Tyan
48d9424e81
am ae83faa3: am 13f6270e: SipAudioCall: use SipErrorCode instead of string in onError()
...
Merge commit 'ae83faa3eeb26b1983fb1b8b663eebfe1f1f61d5'
* commit 'ae83faa3eeb26b1983fb1b8b663eebfe1f1f61d5':
SipAudioCall: use SipErrorCode instead of string in onError()
2010-09-15 07:08:04 -07:00
Hung-ying Tyan
3d4315b7f1
am 3692af92: am 99bf4e45: SIP: remove dependency on javax.sip
...
Merge commit '3692af92ab290a561a927079cbf1f778f57fe5f9'
* commit '3692af92ab290a561a927079cbf1f778f57fe5f9':
SIP: remove dependency on javax.sip
2010-09-15 07:07:56 -07:00
Chung-yih Wang
86fd95efc4
am 316e72cb: am 5dde95b8: Merge "Fix the bug of authentication in an outgoing call." into gingerbread
...
Merge commit '316e72cb05637735c67ae02911dd0dbe096c71f5'
* commit '316e72cb05637735c67ae02911dd0dbe096c71f5':
Fix the bug of authentication in an outgoing call.
2010-09-15 07:07:47 -07:00
Jaikumar Ganesh
b03b3c6778
am b390728b: am a224f70b: Fix interaction between BluetoothEventLoop and BluetoothService.
...
Merge commit 'b390728b54805ecba3e0690edf2b83b60933e6a7'
* commit 'b390728b54805ecba3e0690edf2b83b60933e6a7':
Fix interaction between BluetoothEventLoop and BluetoothService.
2010-09-15 07:07:38 -07:00
Hung-ying Tyan
fa1cec901a
am ca83c25d: am 4565933f: Merge "SipService: deliver connectivity change to all sessions." into gingerbread
...
Merge commit 'ca83c25decd0d4dc9c765a2b42424c7974bd496a'
* commit 'ca83c25decd0d4dc9c765a2b42424c7974bd496a':
SipService: deliver connectivity change to all sessions.
2010-09-15 07:07:19 -07:00
Nipun Kwatra
6cff3123d4
Merge "Added command type to play recording sound."
2010-09-14 17:48:02 -07:00
Chris Palmer
8fb81284c2
am 5bade703: Merge "DO NOT MERGE Correct the PackageManager.checkSignatures documentation." into gingerbread
...
Merge commit '5bade703fd8434ba4cd5c9d1e8e1dc0f383b32b5' into gingerbread-plus-aosp
* commit '5bade703fd8434ba4cd5c9d1e8e1dc0f383b32b5':
DO NOT MERGE Correct the PackageManager.checkSignatures documentation.
2010-09-14 17:45:59 -07:00
Chris Palmer
d843af292e
Merge "DO NOT MERGE Correct the PackageManager.checkSignatures documentation." into gingerbread
2010-09-14 17:43:31 -07:00
Vasu Nori
433a2af7e2
Merge "fix bugs in exception throwing code in native_fillwindow"
2010-09-14 16:40:24 -07:00
John Wang
0cdb120b2a
am 6457a28b: Merge "Complete event registration in CallManager." into gingerbread
...
Merge commit '6457a28be8a0589fd027a86ebdee04a0cc6fefd5' into gingerbread-plus-aosp
* commit '6457a28be8a0589fd027a86ebdee04a0cc6fefd5':
Complete event registration in CallManager.
2010-09-14 16:28:10 -07:00
John Wang
cdf8f7064e
Merge "Complete event registration in CallManager." into gingerbread
2010-09-14 16:26:14 -07:00
Erik
3af74f9874
am 426ee7f2: Fixes some bugs in TimeZoneUtils
...
Merge commit '426ee7f22eeaa016cdbf0addbb7b2cc6b6cc3487' into gingerbread-plus-aosp
* commit '426ee7f22eeaa016cdbf0addbb7b2cc6b6cc3487':
Fixes some bugs in TimeZoneUtils
2010-09-14 16:19:03 -07:00
Vasu Nori
5fdec887ce
Merge "change TAG value from "Cursor" to "SQLiteCursor""
2010-09-14 16:04:26 -07:00
Jason Sams
64e113cb0c
Merge "Fix partial NP2 support and restrict mipmaps and clamp modes on HW that does not support proper NP2 bug 2965170"
2010-09-14 16:02:02 -07:00
Jeff Brown
4f5d8bf9a1
am 09340a4b: Merge "Replace epoll() with poll() and rename PollLoop to Looper." into gingerbread
...
Merge commit '09340a4bb99507d9b6bfbfc68a450d4d4f354d73' into gingerbread-plus-aosp
* commit '09340a4bb99507d9b6bfbfc68a450d4d4f354d73':
Replace epoll() with poll() and rename PollLoop to Looper.
2010-09-14 15:32:03 -07:00
Jaikumar Ganesh
7da40628e2
Merge "Rework Bluetooth tethering networking configuration."
2010-09-14 15:27:47 -07:00
Jeff Brown
b06cca6228
Merge "Replace epoll() with poll() and rename PollLoop to Looper." into gingerbread
2010-09-14 15:27:33 -07:00
Nipun Kwatra
2db10d6697
Merge "Adding enable/disable option for sendCommand()"
2010-09-14 15:15:16 -07:00
Adam Powell
f31bcfd4db
Merge "Improve ListView smooth scrolling timing"
2010-09-14 15:14:56 -07:00
Mathias Agopian
5e4cf02dfe
am b3ffc78f: Merge "Add logging of various important graphics events" into gingerbread
...
Merge commit 'b3ffc78f3432344702e6f5232067ab624083cad2' into gingerbread-plus-aosp
* commit 'b3ffc78f3432344702e6f5232067ab624083cad2':
Add logging of various important graphics events
2010-09-14 15:14:10 -07:00
Mathias Agopian
959d007a86
Merge "Add logging of various important graphics events" into gingerbread
2010-09-14 15:11:33 -07:00