Hung-ying Tyan
6308514cbf
am 156edcc9: am 9404e633: Merge "Add timer to SIP session creation process." into gingerbread
...
Merge commit '156edcc9f64e010d6b6de97e9a77adfccee353eb'
* commit '156edcc9f64e010d6b6de97e9a77adfccee353eb':
Add timer to SIP session creation process.
2010-09-16 23:44:42 -07:00
Hung-ying Tyan
156edcc9f6
am 9404e633: Merge "Add timer to SIP session creation process." into gingerbread
...
Merge commit '9404e633a55cd325b57732cdd776053b3886b611' into gingerbread-plus-aosp
* commit '9404e633a55cd325b57732cdd776053b3886b611':
Add timer to SIP session creation process.
2010-09-16 23:40:28 -07:00
Hung-ying Tyan
9352cf1a4d
Add timer to SIP session creation process.
...
+ add timer parameter to ISipSession.make/changeCall(),
+ add timer paramter to SipAudioCall.make/answer/hold/continueCall()'s,
+ add timer parameter to SipManager.makeAudioCall(),
+ modify implementation in SipSessionGroup, SipAudioCallImpl accordingly,
+ make SipPhone to use it with 8-second timeout.
http://b/issue?id=2994748
Change-Id: I661a887e5810087ddc5e2318335e2fa427f80ec6
2010-09-17 13:31:05 +08:00
Wink Saville
f61101f626
Add LinkCapabilities
...
Change-Id: Ia1599ade936b79f12526252c0a2e6b453abb136e
2010-09-16 21:26:59 -07:00
Hung-ying Tyan
fa03cfaeeb
am f4fd88f8: am c7510581: SipService: add log control, suppress ping log.
...
Merge commit 'f4fd88f8d8cacff718268b6349bcb8c6a28006f3'
* commit 'f4fd88f8d8cacff718268b6349bcb8c6a28006f3':
SipService: add log control, suppress ping log.
2010-09-16 04:53:30 -07:00
Hung-ying Tyan
f4fd88f8d8
am c7510581: SipService: add log control, suppress ping log.
...
Merge commit 'c7510581b81d63536db7d46ca8533106c8cf57c6' into gingerbread-plus-aosp
* commit 'c7510581b81d63536db7d46ca8533106c8cf57c6':
SipService: add log control, suppress ping log.
2010-09-16 04:50:25 -07:00
Hung-ying Tyan
c7510581b8
SipService: add log control, suppress ping log.
...
Change-Id: I78332ddee1272be41b1fbc80c603e41200c6be1a
2010-09-16 19:45:20 +08:00
Chung-yih Wang
0c2b04bb53
am 1e27dc97: am 0e063382: Fix the unhandled authentication message.
...
Merge commit '1e27dc978d5e929679f96eaed541c14b37cd1118'
* commit '1e27dc978d5e929679f96eaed541c14b37cd1118':
Fix the unhandled authentication message.
2010-09-15 23:35:37 -07:00
Chung-yih Wang
1e27dc978d
am 0e063382: Fix the unhandled authentication message.
...
Merge commit '0e0633828928481658c0e09e5893f6214b57ba38' into gingerbread-plus-aosp
* commit '0e0633828928481658c0e09e5893f6214b57ba38':
Fix the unhandled authentication message.
2010-09-15 23:32:34 -07:00
Jeff Brown
fa8186c716
am 7642c82c: am f4d788c9: Merge "Make input dispatcher only ANR for foreground windows." into gingerbread
...
Merge commit '7642c82c291051919aad87c797e2dc1d77ed55e1'
* commit '7642c82c291051919aad87c797e2dc1d77ed55e1':
Make input dispatcher only ANR for foreground windows.
2010-09-15 21:42:28 -07:00
Chung-yih Wang
0e06338289
Fix the unhandled authentication message.
...
bug id: http://b/2991911
Change-Id: Iec86e3aee0fb12034ee25bc0e93fd575c1208a5f
2010-09-16 12:32:26 +08:00
Robert Greenwalt
5b7c5e0552
am f434dd16: am 134b28a7: Merge "Update Inet Connection Status display" into gingerbread
...
Merge commit 'f434dd1660f222a1ee85e77c98893b90857805c2'
* commit 'f434dd1660f222a1ee85e77c98893b90857805c2':
Update Inet Connection Status display
2010-09-15 19:49:53 -07:00
Jeff Brown
7642c82c29
am f4d788c9: Merge "Make input dispatcher only ANR for foreground windows." into gingerbread
...
Merge commit 'f4d788c9309bc5480100d980608472e4cb04f309' into gingerbread-plus-aosp
* commit 'f4d788c9309bc5480100d980608472e4cb04f309':
Make input dispatcher only ANR for foreground windows.
2010-09-15 18:57:48 -07:00
Jeff Brown
f4d788c930
Merge "Make input dispatcher only ANR for foreground windows." into gingerbread
2010-09-15 18:55:25 -07:00
Jeff Brown
519e024d1e
Make input dispatcher only ANR for foreground windows.
...
Redesigned the input dispatcher's ANR timeout mechanism so it is much
closer to Froyo's policy. ANR is only ever signalled if the dispatcher
is waiting on a window to finish processing its previous event(s) and
there is new pending input.
In the old code, we tracked the dispatch timeout separately for each
input channel. This was somewhat complicated and also resulted in the
situation where applications could ANR long after the user had pushed
them into the background.
Change-Id: I666ecada0952d4b95f1d67b9f733842b745c7f4b
2010-09-15 18:52:08 -07:00
Robert Greenwalt
f434dd1660
am 134b28a7: Merge "Update Inet Connection Status display" into gingerbread
...
Merge commit '134b28a7f049719cb74fd5baadbbcc5915bc861b' into gingerbread-plus-aosp
* commit '134b28a7f049719cb74fd5baadbbcc5915bc861b':
Update Inet Connection Status display
2010-09-15 18:02:59 -07:00
Robert Greenwalt
134b28a7f0
Merge "Update Inet Connection Status display" into gingerbread
2010-09-15 17:59:54 -07:00
Robert Greenwalt
1e9aac2bd8
Update Inet Connection Status display
...
Cellular signal strength should also be green - these assets aren't, but
the art guys are working on that.
Also using a new intent so we don't overload the CONNECTIVITY_ACTION and
confuse the apps.
bug:2994024
Change-Id: I6fe8f65dd6e9869d9724064c4fae45340491a4d8
2010-09-15 17:54:17 -07:00
Hung-ying Tyan
3e5246b2eb
am 8a33e964: am 5306e0a8: Merge "SIP: add PEER_NOT_REACHABLE error feedback." into gingerbread
...
Merge commit '8a33e964c48d22469487c8ec1d951826b7e3e562'
* commit '8a33e964c48d22469487c8ec1d951826b7e3e562':
SIP: add PEER_NOT_REACHABLE error feedback.
2010-09-15 16:47:30 -07:00
Hung-ying Tyan
bb5fb60c7c
am 8d9e8de2: am 096df819: Merge "SipService: send SERVER_ERROR if server doesn\'t provide nonce" into gingerbread
...
Merge commit '8d9e8de2c920e8c9dc2da33410780ec739076bb9'
* commit '8d9e8de2c920e8c9dc2da33410780ec739076bb9':
SipService: send SERVER_ERROR if server doesn't provide nonce
2010-09-15 16:47:22 -07:00
Kenny Root
6545fcfd96
am 79a1ee42: am cee0b97e: Merge "Free AssetManager weak refs before unmounting" into gingerbread
...
Merge commit '79a1ee4249aadc84558dad2e275b8edde198da76'
* commit '79a1ee4249aadc84558dad2e275b8edde198da76':
Free AssetManager weak refs before unmounting
2010-09-15 16:32:45 -07:00
Steve Howard
e28d80a80a
am d2de99e3: am 536ee090: Merge "Fix name shadowing bug with revoking URI permissions." into gingerbread
...
Merge commit 'd2de99e377408dc28dca5e4c61a816879595fbf3'
* commit 'd2de99e377408dc28dca5e4c61a816879595fbf3':
Fix name shadowing bug with revoking URI permissions.
2010-09-15 16:32:30 -07:00
Amith Yamasani
6734b9f680
Provide automatic date/time based on NTP lookup.
...
Do this on a periodic basis as well as when the AUTO_TIME setting changes to true.
If we recently acquired NITZ time from the telephony provider, then don't override
with NTP time.
2010-09-15 13:14:18 -07:00
Dianne Hackborn
eba36ff80d
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
Brad Fitzpatrick
b835d9abd6
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
562ec84987
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
Hung-ying Tyan
8a33e964c4
am 5306e0a8: Merge "SIP: add PEER_NOT_REACHABLE error feedback." into gingerbread
...
Merge commit '5306e0a85dabd4c18a7b3f81acc0f582f9429482' into gingerbread-plus-aosp
* commit '5306e0a85dabd4c18a7b3f81acc0f582f9429482':
SIP: add PEER_NOT_REACHABLE error feedback.
2010-09-15 07:42:48 -07:00
Hung-ying Tyan
8d9e8de2c9
am 096df819: Merge "SipService: send SERVER_ERROR if server doesn\'t provide nonce" into gingerbread
...
Merge commit '096df8197b9133703d2ed0abb69813db0c8b4129' into gingerbread-plus-aosp
* commit '096df8197b9133703d2ed0abb69813db0c8b4129':
SipService: send SERVER_ERROR if server doesn't provide nonce
2010-09-15 07:42:38 -07:00
Hung-ying Tyan
fbfb6f2f04
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
Kenny Root
685da21c1c
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
fcc7fb8a1a
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
4586063969
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
Hung-ying Tyan
074663c762
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
Hung-ying Tyan
5306e0a85d
Merge "SIP: add PEER_NOT_REACHABLE error feedback." into gingerbread
2010-09-14 23:10:03 -07:00
Hung-ying Tyan
096df8197b
Merge "SipService: send SERVER_ERROR if server doesn't provide nonce" into gingerbread
2010-09-14 23:09:26 -07:00
Hung-ying Tyan
ae076d3981
SIP: add PEER_NOT_REACHABLE error feedback.
...
http://b/issue?id=3002033
Change-Id: Ib64b08919d214acbab89945ac19dc113a68e62ad
2010-09-15 11:30:45 +08:00
Kenny Root
79a1ee4249
am cee0b97e: Merge "Free AssetManager weak refs before unmounting" into gingerbread
...
Merge commit 'cee0b97eed0a460e2da58500e24d3e4dac5cb9f6' into gingerbread-plus-aosp
* commit 'cee0b97eed0a460e2da58500e24d3e4dac5cb9f6':
Free AssetManager weak refs before unmounting
2010-09-14 18:04:53 -07:00
Kenny Root
cee0b97eed
Merge "Free AssetManager weak refs before unmounting" into gingerbread
2010-09-14 18:02:39 -07:00
Steve Howard
d2de99e377
am 536ee090: Merge "Fix name shadowing bug with revoking URI permissions." into gingerbread
...
Merge commit '536ee090ef75add0f7244c1c22be83fe03a66010' into gingerbread-plus-aosp
* commit '536ee090ef75add0f7244c1c22be83fe03a66010':
Fix name shadowing bug with revoking URI permissions.
2010-09-14 17:48:30 -07:00
Steve Howard
536ee090ef
Merge "Fix name shadowing bug with revoking URI permissions." into gingerbread
2010-09-14 17:46:22 -07:00
Steve Howard
0de8ddb0cf
Fix name shadowing bug with revoking URI permissions.
...
Change-Id: Ibfcb0dc73c6b1a111dbb8d56e6f0b78084f5e4e6
2010-09-14 16:29:26 -07:00
Jaikumar Ganesh
4c9a5be4a3
Merge "Rework Bluetooth tethering networking configuration."
2010-09-14 15:27:47 -07:00
Jaikumar Ganesh
707952ecd4
Rework Bluetooth tethering networking configuration.
...
Limit it to 5 for now, and store the iface.
Change-Id: Ia6044b8e8f886dcd587ab0bb57273e0c11b6cd74
2010-09-14 15:25:14 -07:00
Kenny Root
aa48540222
Free AssetManager weak refs before unmounting
...
AssetManagers are kept in WeakReference pools so there's a change
another thread in the system_server has opened a file on the external
card. Attempt to force a garbage collection to free these references
each time we're about to unmount a volume on the external storage.
Change-Id: I6e816e8c67b179887e488dc6758b43bcdd5914fb
2010-09-14 14:49:41 -07:00
Dianne Hackborn
227afd3a1b
am 1188f5e7: Merge "Fix problem where power manager was calling battery stats with bad wl type." into gingerbread
...
Merge commit '1188f5e76cfcd512c4e2fae00ac0bfba3150bd7b' into gingerbread-plus-aosp
* commit '1188f5e76cfcd512c4e2fae00ac0bfba3150bd7b':
Fix problem where power manager was calling battery stats with bad wl type.
2010-09-14 12:31:07 -07:00
Dianne Hackborn
1188f5e76c
Merge "Fix problem where power manager was calling battery stats with bad wl type." into gingerbread
2010-09-14 12:28:08 -07:00
Hung-ying Tyan
88203cb111
SipService: send SERVER_ERROR if server doesn't provide nonce
...
in authentication response.
Change-Id: I93e8c0d6754399ca2f382033085e40fc4c6ccb19
2010-09-15 03:00:19 +08: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