Dianne Hackborn
264e727775
am 934516e1: Merge "Fix issue #2999795 : Runtime restart on Crespo" into gingerbread
...
Merge commit '934516e10150874fd1db5ab9e0be3ae793441fd8' into gingerbread-plus-aosp
* commit '934516e10150874fd1db5ab9e0be3ae793441fd8':
Fix issue #2999795 : Runtime restart on Crespo
2010-09-14 11:54:28 -07:00
Dianne Hackborn
934516e101
Merge "Fix issue #2999795 : Runtime restart on Crespo" into gingerbread
2010-09-14 11:50:51 -07:00
Dianne Hackborn
83770289f8
Fix issue #2999795 : Runtime restart on Crespo
...
Change-Id: I7138b031298a234f3f35aec4a003d25cf86a57ff
2010-09-14 11:45:44 -07:00
Brad Fitzpatrick
f26ac1f8ed
am 96d6c345: Merge "Unify some duplicate StrictMode-enabling code." into gingerbread
...
Merge commit '96d6c3454c3550486a2efa25ca0c83732b5e2eaf' into gingerbread-plus-aosp
* commit '96d6c3454c3550486a2efa25ca0c83732b5e2eaf':
Unify some duplicate StrictMode-enabling code.
2010-09-14 11:39:54 -07:00
Brad Fitzpatrick
79cc46d1b0
am fb85bc66: Merge "Add missing wallpaper service lock." into gingerbread
...
Merge commit 'fb85bc66c467be96fe8420338321df6f15359d7d' into gingerbread-plus-aosp
* commit 'fb85bc66c467be96fe8420338321df6f15359d7d':
Add missing wallpaper service lock.
2010-09-14 11:39:43 -07:00
Brad Fitzpatrick
96d6c3454c
Merge "Unify some duplicate StrictMode-enabling code." into gingerbread
2010-09-14 11:37:13 -07:00
Brad Fitzpatrick
fb85bc66c4
Merge "Add missing wallpaper service lock." into gingerbread
2010-09-14 11:37:05 -07:00
Romain Guy
282315e154
am 52e19d59: Merge "Change the keep alive time for excess idle threads." into gingerbread
...
Merge commit '52e19d5917b8f057131c1dc8b3eb772febd791d9' into gingerbread-plus-aosp
* commit '52e19d5917b8f057131c1dc8b3eb772febd791d9':
Change the keep alive time for excess idle threads.
2010-09-14 11:36:55 -07:00
Romain Guy
52e19d5917
Merge "Change the keep alive time for excess idle threads." into gingerbread
2010-09-14 11:34:01 -07:00
Brad Fitzpatrick
194b19a4b3
Add missing wallpaper service lock.
...
Unimportant, but found while reading the code for other reasons.
Change-Id: I9f2fad3ff5d081aef7a35e5f33ec5de7dc92195e
2010-09-14 11:30:29 -07:00
Romain Guy
6b424f4770
Change the keep alive time for excess idle threads.
...
Change-Id: Ie076544df5ee8df185f0824333fdc62203a565c2
2010-09-14 11:30:27 -07:00
Brian Carlstrom
e68f8b7ebe
am 405d4db5: Rename internal SSLParameters to SSLParametersImpl to avoid collision with new javax.net.ssl.SSLParameters
...
Merge commit '405d4db50b3db1fc5e015475218e190d193332d4' into gingerbread-plus-aosp
* commit '405d4db50b3db1fc5e015475218e190d193332d4':
Rename internal SSLParameters to SSLParametersImpl to avoid collision with new javax.net.ssl.SSLParameters
2010-09-14 11:29:57 -07:00
Brian Carlstrom
405d4db50b
Rename internal SSLParameters to SSLParametersImpl to avoid collision with new javax.net.ssl.SSLParameters
...
Bug: 2672817
Change-Id: Ibe20830f024f76232f3628cfca922d49a5a06bef
2010-09-14 11:24:13 -07:00
Brian Carlstrom
0535d8577f
am 94126238: Merge "Remove SSLContextImpl.engineInit(..) that takes persistent cache arguments" into gingerbread
...
Merge commit '94126238427f04ecb86fe6832113afb2f04e89b5' into gingerbread-plus-aosp
* commit '94126238427f04ecb86fe6832113afb2f04e89b5':
Remove SSLContextImpl.engineInit(..) that takes persistent cache arguments
2010-09-14 11:17:22 -07:00
Brian Carlstrom
9412623842
Merge "Remove SSLContextImpl.engineInit(..) that takes persistent cache arguments" into gingerbread
2010-09-14 11:15:01 -07:00
John Wang
e92fdd261e
am e7b92d7b: Merge "Return immutable copies of private callList." into gingerbread
...
Merge commit 'e7b92d7b53343119173558302ecfb3986ae0fbd6' into gingerbread-plus-aosp
* commit 'e7b92d7b53343119173558302ecfb3986ae0fbd6':
Return immutable copies of private callList.
2010-09-14 10:31:45 -07:00
John Wang
e7b92d7b53
Merge "Return immutable copies of private callList." into gingerbread
2010-09-14 10:28:33 -07:00
Leon Scroggins III
720d5985f5
am 901b7b9b: am ca8f3d04: Merge "Add an option to hide the Voice Search icon." into froyo
...
Merge commit '901b7b9b17d20dc8085fb5fd3bab0f0804f3906b' into gingerbread-plus-aosp
* commit '901b7b9b17d20dc8085fb5fd3bab0f0804f3906b':
Add an option to hide the Voice Search icon.
2010-09-14 10:26:44 -07:00
Leon Scroggins III
901b7b9b17
am ca8f3d04: Merge "Add an option to hide the Voice Search icon." into froyo
...
Merge commit 'ca8f3d04284a26477257a0c2b34d83c86d15efe9' into gingerbread
* commit 'ca8f3d04284a26477257a0c2b34d83c86d15efe9':
Add an option to hide the Voice Search icon.
2010-09-14 10:23:35 -07:00
Leon Scroggins III
ca8f3d0428
Merge "Add an option to hide the Voice Search icon." into froyo
2010-09-14 10:21:25 -07:00
Hung-ying Tyan
188a8f1b72
am 89a7180a: Merge "SipService: ignore connect event for non-active networks." into gingerbread
...
Merge commit '89a7180a242043a0b4d6695bf386c93365bf6797' into gingerbread-plus-aosp
* commit '89a7180a242043a0b4d6695bf386c93365bf6797':
SipService: ignore connect event for non-active networks.
2010-09-14 10:00:14 -07:00
Hung-ying Tyan
89a7180a24
Merge "SipService: ignore connect event for non-active networks." into gingerbread
2010-09-14 09:57:47 -07:00
Hung-ying Tyan
12bec5ddf5
SipService: ignore connect event for non-active networks.
...
+ sanity check and remove redundant code.
Change-Id: I4d3e226851ad7fc4d88ddcd0a5c58f7e33b6c14a
2010-09-15 00:49:02 +08:00
Dirk Dougherty
f9c7a3e25e
am e71396cf: am 4b4af990: Doc change: update ADT 0.9.8 checksum and size.
...
Merge commit 'e71396cf4704ee9e26f510b511c1e793d8048d83' into gingerbread-plus-aosp
* commit 'e71396cf4704ee9e26f510b511c1e793d8048d83':
Doc change: update ADT 0.9.8 checksum and size.
2010-09-14 09:46:44 -07:00
Kenny Root
3ca2691446
am 30434415: Merge "Dedupe timestamp in PackageSettings" into gingerbread
...
Merge commit '3043441511e4483d24dc6f42e1ee7f7e9dc71be2' into gingerbread-plus-aosp
* commit '3043441511e4483d24dc6f42e1ee7f7e9dc71be2':
Dedupe timestamp in PackageSettings
2010-09-14 09:46:40 -07:00
Hung-ying Tyan
ae83faa3ee
am 13f6270e: SipAudioCall: use SipErrorCode instead of string in onError()
...
Merge commit '13f6270eb14b409709c936b828e2a2fd40e427c4' into gingerbread-plus-aosp
* commit '13f6270eb14b409709c936b828e2a2fd40e427c4':
SipAudioCall: use SipErrorCode instead of string in onError()
2010-09-14 09:44:03 -07:00
Hung-ying Tyan
3692af92ab
am 99bf4e45: SIP: remove dependency on javax.sip
...
Merge commit '99bf4e45c4566172189735b34b368b76660ca57a' into gingerbread-plus-aosp
* commit '99bf4e45c4566172189735b34b368b76660ca57a':
SIP: remove dependency on javax.sip
2010-09-14 09:43:54 -07:00
Chung-yih Wang
316e72cb05
am 5dde95b8: Merge "Fix the bug of authentication in an outgoing call." into gingerbread
...
Merge commit '5dde95b8fe0fea1a115a68f8acf826371da89da7' into gingerbread-plus-aosp
* commit '5dde95b8fe0fea1a115a68f8acf826371da89da7':
Fix the bug of authentication in an outgoing call.
2010-09-14 09:43:46 -07:00
Jaikumar Ganesh
b390728b54
am a224f70b: Fix interaction between BluetoothEventLoop and BluetoothService.
...
Merge commit 'a224f70b1efc29d9698da5b5c143251a43838f2b' into gingerbread-plus-aosp
* commit 'a224f70b1efc29d9698da5b5c143251a43838f2b':
Fix interaction between BluetoothEventLoop and BluetoothService.
2010-09-14 09:43:31 -07:00
Hung-ying Tyan
ca83c25dec
am 4565933f: Merge "SipService: deliver connectivity change to all sessions." into gingerbread
...
Merge commit '4565933f03a99750a333e97e95408c404984510f' into gingerbread-plus-aosp
* commit '4565933f03a99750a333e97e95408c404984510f':
SipService: deliver connectivity change to all sessions.
2010-09-14 09:43:17 -07:00
Dirk Dougherty
e71396cf47
am 4b4af990: Doc change: update ADT 0.9.8 checksum and size.
...
Merge commit '4b4af990af527c79073d546ead1850278caa7a8e' into gingerbread
* commit '4b4af990af527c79073d546ead1850278caa7a8e':
Doc change: update ADT 0.9.8 checksum and size.
2010-09-14 09:39:59 -07:00
Kenny Root
3043441511
Merge "Dedupe timestamp in PackageSettings" into gingerbread
2010-09-14 09:29:48 -07:00
Dirk Dougherty
4b4af990af
Doc change: update ADT 0.9.8 checksum and size.
...
Change-Id: I610985683cd4608b075a22e8d8089de7896eb312
2010-09-14 09:17:33 -07:00
Brad Fitzpatrick
50d66f9fcd
Unify some duplicate StrictMode-enabling code.
...
Change-Id: Ifb92f35d9e245dbdb5e201597d8be702bce9e8b8
2010-09-14 08:22:30 -07:00
Leon Scroggins III
4a02800946
Add an option to hide the Voice Search icon.
...
Some search engines do not support voice search, so provide a flag
to disable showing the icon in the SearchDialog.
Change-Id: I7ef4ad5d382edb86c08014260defa4af6d5eca0a
2010-09-14 10:56:25 -04:00
Hung-ying Tyan
13f6270eb1
SipAudioCall: use SipErrorCode instead of string in onError()
...
and fix callback in setListener().
Change-Id: Ic2622df992a2ad45cb1e3f71736f320897ae8fb3
2010-09-14 21:36:10 +08:00
Hung-ying Tyan
99bf4e45c4
SIP: remove dependency on javax.sip
...
and change errorCodeString to errorCode in
SipRegistrationListener.onRegistrationFailed().
Change-Id: Id9618f5a4b0effaed04f8b0dc60347499d9e4501
2010-09-14 20:29:02 +08:00
Brian Carlstrom
2c42c8fbaf
Remove SSLContextImpl.engineInit(..) that takes persistent cache arguments
...
Bug: 2672817
Change-Id: If5f10fa16eaf5676a0c1540463759cd4e0e837de
2010-09-14 00:11:14 -07:00
Chung-yih Wang
5dde95b8fe
Merge "Fix the bug of authentication in an outgoing call." into gingerbread
2010-09-13 23:31:18 -07:00
Chung-yih Wang
7d137e40cd
Fix the bug of authentication in an outgoing call.
...
Since we missed the check of another challenge header in the
proxy authentication response.
Change-Id: Ie5b9d22c6c55b4d65619d2194c88845e7dd59f15
2010-09-14 14:17:02 +08:00
Jaikumar Ganesh
a224f70b1e
Fix interaction between BluetoothEventLoop and BluetoothService.
...
BluetoothEventLoop primarily handles event notifications from Bluez.
It should know innards of Bonding and especially BondState.
BondState class and BluetoothService call into each other.
When BluetoothEvent loop gets the handle to BondState it leads
to deadlocks and ANRs.
Change-Id: I785c57f6246c1288350d26d4acb87d879b27a5f9
2010-09-13 21:58:10 -07:00
Hung-ying Tyan
4565933f03
Merge "SipService: deliver connectivity change to all sessions." into gingerbread
2010-09-13 19:53:58 -07:00
John Wang
bc0e400d78
Return immutable copies of private callList.
...
Change-Id: I3da97acf89e044515e98fa04233dd378c32c250d
2010-09-13 19:10:21 -07:00
Dianne Hackborn
6421ae7eff
am 5251c800: Merge "Fix potential crash in sync." into gingerbread
...
Merge commit '5251c800c93c6f6fd473475c36b8ab3b360c1e4d' into gingerbread-plus-aosp
* commit '5251c800c93c6f6fd473475c36b8ab3b360c1e4d':
Fix potential crash in sync.
2010-09-13 17:26:34 -07:00
Dianne Hackborn
5251c800c9
Merge "Fix potential crash in sync." into gingerbread
2010-09-13 17:21:04 -07:00
Dianne Hackborn
527c02838b
am a0eb56ac: Merge "Work on issue #2991868 : A toast pops up informing users..." into gingerbread
...
Merge commit 'a0eb56ac59751ab7fb060980e14edcacca439635' into gingerbread-plus-aosp
* commit 'a0eb56ac59751ab7fb060980e14edcacca439635':
Work on issue #2991868 : A toast pops up informing users...
2010-09-13 17:17:19 -07:00
Dianne Hackborn
a0eb56ac59
Merge "Work on issue #2991868 : A toast pops up informing users..." into gingerbread
2010-09-13 17:14:00 -07:00
Dianne Hackborn
50addddba5
Fix potential crash in sync.
...
Change-Id: I523d8faa24b7ba57dcc09cbe91b5cb91d9f6f262
2010-09-13 17:12:51 -07:00
Hung-ying Tyan
d231aa880a
SipService: deliver connectivity change to all sessions.
...
+ add DATA_CONNECTION_LOST to SipErrorCode
+ convert it to Connection.DisconnectCause.LOST_SIGNAL in SipPhone
http://b/issue?id=2992548
Change-Id: Ie8983c1b81077b21f46304cf60b8e61df1ffd241
2010-09-14 08:00:09 +08:00
Dianne Hackborn
8c5755aab5
Work on issue #2991868 : A toast pops up informing users...
...
...that Market took over the screen after signing into a Google account
Don't warn the user about a new activity coming up on an activity that
is finishing.
Change-Id: I573073139d42a485473d0c8a7df450c1a23c35c3
2010-09-13 16:58:59 -07:00
