3689 Commits

Author SHA1 Message Date
Hung-ying Tyan
031d878682 am fe2d279c: am 00a22064: SipService: handle cross-domain authentication error
Merge commit 'fe2d279c5ef571340f20d433badd9f68072299af'

* commit 'fe2d279c5ef571340f20d433badd9f68072299af':
  SipService: handle cross-domain authentication error
2010-09-27 11:47:32 -07:00
Hung-ying Tyan
c5027642ff am 025a39af: SIP: misc fixes
Merge commit '025a39af346f39743c1e384b9000ce1baee36562' into gingerbread-plus-aosp

* commit '025a39af346f39743c1e384b9000ce1baee36562':
  SIP: misc fixes
2010-09-27 11:20:30 -07:00
Hung-ying Tyan
fe2d279c5e am 00a22064: SipService: handle cross-domain authentication error
Merge commit '00a22064efef4f574e439079aae2deae1a087a31' into gingerbread-plus-aosp

* commit '00a22064efef4f574e439079aae2deae1a087a31':
  SipService: handle cross-domain authentication error
2010-09-27 11:20:24 -07:00
Hung-ying Tyan
fccd5bc78f Fix build.
Change-Id: Ie47b63f02764e8a1ca1d36f502b6b4134859ff0d
2010-09-28 02:16:32 +08:00
Hung-ying Tyan
025a39af34 SIP: misc fixes
+ check REQUEST_TERMINATED response on INVITE not CANCEL,
+ check if a TransactionTerminatedEvent matches the ongoing transaction,
+ add log to track SipConnection disconnect events.

Change-Id: I28325be62ac44e4a7507d3c4b5b78b066c0ea2ad
2010-09-28 01:52:42 +08:00
Hung-ying Tyan
00a22064ef SipService: handle cross-domain authentication error
and add new CROSS_DOMAIN_AUTHENTICATION error code and OUT_OF_NETWORK
DisconnectCause.

http://b/issue?id=3020185

Change-Id: Icc0a341599d5a72b7cb2d43675fbddc516544978
2010-09-27 10:45:24 -07:00
Kenny Root
831f898756 am 8f767774: am 465618ed: Merge "Use buffered output during packages.xml write" into gingerbread
Merge commit '8f767774230cba9b5cfc298f2e24972a79cd0182'

* commit '8f767774230cba9b5cfc298f2e24972a79cd0182':
  Use buffered output during packages.xml write
2010-09-27 08:28:07 -07:00
Kenny Root
8f76777423 am 465618ed: Merge "Use buffered output during packages.xml write" into gingerbread
Merge commit '465618ed567c418442890fcf91b6ee361b22b88b' into gingerbread-plus-aosp

* commit '465618ed567c418442890fcf91b6ee361b22b88b':
  Use buffered output during packages.xml write
2010-09-27 08:15:57 -07:00
Dianne Hackborn
8313fc7e94 Allow all apps to call ContentResolver.getType().
I can't find the bug number for this, but it is needed for some things
we are doing where the app building an intent may not have access to the
URI in the data field.  This is for HC, but doing in GB to avoid introducing
integration issues.

Change-Id: I0cac971854198b18775d2a73deb80f23431bfbe2
2010-09-26 21:31:47 -07:00
Kenny Root
9f306d78a4 Use buffered output during packages.xml write
FileOutputStream writes data one byte at a time, so use the
BufferedOutputStream to wrap it and write once all the XML serialization
is done.

Change-Id: I419a6fcac2ac9a72a6cf41d4ca6e7ab6c7505618
2010-09-26 11:19:47 -07:00
Jeff Brown
22ba86cfaf am ca25d2c3: am 4d94a766: Fixed some timeout and lock reentrance issues with broadcasts.
Merge commit 'ca25d2c31dc20f69597be8f34d6da9167d53b4d0'

* commit 'ca25d2c31dc20f69597be8f34d6da9167d53b4d0':
  Fixed some timeout and lock reentrance issues with broadcasts.
2010-09-24 16:14:08 -07:00
Jeff Brown
ca25d2c31d am 4d94a766: Fixed some timeout and lock reentrance issues with broadcasts.
Merge commit '4d94a766c3f7cf32dd3f5d543048fa801ad22813' into gingerbread-plus-aosp

* commit '4d94a766c3f7cf32dd3f5d543048fa801ad22813':
  Fixed some timeout and lock reentrance issues with broadcasts.
2010-09-24 16:07:24 -07:00
Jeff Brown
4d94a766c3 Fixed some timeout and lock reentrance issues with broadcasts.
When starting a broadcast, the ActivityManagerService posts a delayed
BROADCAST_TIMEOUT_MSG to handle timeouts.  If a premature timeout occurs,
we post a new BROADCAST_TIMEOUT_MSG to extend the timeout time for the
current receiver.  However, if the current receiver does timeout, the
message is consumed and no replacement is ever posted.

To fix the dropped timeouts, we track whether we have a pending broadcast
timeout message and setup a new one when we begin working on the next receiver.

As a last resort, performNextBroadcast contains code to detect whether
a broadcast appears to be hung (timeout handling failed).  If so, it
calls broadcastTimeout to cause it to timeout immediately.
However, performNextBroadcast is holding on to the ActivityManagerService
lock while doing this but broadcastTimout expected to be called
while the lock was not held since after updating the broadcast record state,
it calls appNotResponding.

To fix the unintentended lock reentrance, changed broadcastTimeout to
assume the lock is already held (and the callers ensure this) then
added code to perform the ANR asynchronously.

Renamed a few methods to add "Locked" suffixes where appropriate and added
a few comments for tricky areas uncovered during review.

Change-Id: I3cb5b06d6b6a4a338f32c0998db721f6acf3b082
2010-09-24 16:00:25 -07:00
Dianne Hackborn
405e012681 am deaa8ff1: am a7ef18fc: Merge "Some debugging support." into gingerbread
Merge commit 'deaa8ff1b10d38add4f7c276e7be2ffc19359a14'

* commit 'deaa8ff1b10d38add4f7c276e7be2ffc19359a14':
  Some debugging support.
2010-09-24 15:58:25 -07:00
Hung-ying Tyan
3011b66172 am d6d83279: am 194bbcce: SIP: longer timeout for making call, shorter for cancelling
Merge commit 'd6d83279183db749de07bfdac79fe4180fc848d0'

* commit 'd6d83279183db749de07bfdac79fe4180fc848d0':
  SIP: longer timeout for making call, shorter for cancelling
2010-09-24 15:58:09 -07:00
Dianne Hackborn
deaa8ff1b1 am a7ef18fc: Merge "Some debugging support." into gingerbread
Merge commit 'a7ef18fca50d0db99a161d8c7e2d8979f0445503' into gingerbread-plus-aosp

* commit 'a7ef18fca50d0db99a161d8c7e2d8979f0445503':
  Some debugging support.
2010-09-24 15:32:51 -07:00
Dianne Hackborn
a7ef18fca5 Merge "Some debugging support." into gingerbread 2010-09-24 15:28:34 -07:00
Hung-ying Tyan
d6d8327918 am 194bbcce: SIP: longer timeout for making call, shorter for cancelling
Merge commit '194bbcce9ba15634500f542b9ea017b2cf154b45' into gingerbread-plus-aosp

* commit '194bbcce9ba15634500f542b9ea017b2cf154b45':
  SIP: longer timeout for making call, shorter for cancelling
2010-09-24 15:19:05 -07:00
Hung-ying Tyan
194bbcce9b SIP: longer timeout for making call, shorter for cancelling
http://b/3021865

Change-Id: I354ebcc00f1ac68e4b7b466745c36aeb314f9138
2010-09-25 06:09:00 +08:00
Robert Greenwalt
f333123d50 resolved conflicts for merge of 2d457a32 to master
Change-Id: I08fc7881010083407a102f471483cd6d5b9774b4
2010-09-24 14:47:06 -07:00
Dianne Hackborn
f123e49bf0 Some debugging support.
- New feature to "am monitor" to have it automatically launch
  gdbserv for you when a crash/ANR happens, and tell you how to
  run the client.

- Update dumpstate to match new location of binder debug logs

- Various commented out logs that are being used to track down
  issues.

Change-Id: Ia5dd0cd2df983a1fc6be697642a4590aa02a26a5
2010-09-24 13:11:55 -07:00
Robert Greenwalt
2d457a32a6 am 8f97fe55: Merge "Move long Connectivity tasks to handler thread." into gingerbread
Merge commit '8f97fe551e7bd95abf395eed303b975eaa8f0158' into gingerbread-plus-aosp

* commit '8f97fe551e7bd95abf395eed303b975eaa8f0158':
  Move long Connectivity tasks to handler thread.
2010-09-24 11:09:29 -07:00
Robert Greenwalt
8f97fe551e Merge "Move long Connectivity tasks to handler thread." into gingerbread 2010-09-24 10:42:46 -07:00
Chia-chi Yeh
50d9f32506 am 33460d83: am 658bec95: SDP: remove dead code.
Merge commit '33460d836fc2a062290d72ebcfb73af51ffa9c36'

* commit '33460d836fc2a062290d72ebcfb73af51ffa9c36':
  SDP: remove dead code.
2010-09-23 22:50:10 -07:00
Hung-ying Tyan
22a62d1342 resolved conflicts for merge of ee813bae to master
Change-Id: I84ca961fb18b29313b5ec6041a79ca87a1a1cd68
2010-09-24 13:45:43 +08:00
Joe Onorato
77cf6f29f9 am 982c07e9: am cbb7b05e: Merge "Crash apps when they provide bad notifications instead of crashing the system process." into gingerbread
Merge commit '982c07e908c4cb66db224ccfd0810bf8bd449835'

* commit '982c07e908c4cb66db224ccfd0810bf8bd449835':
  Crash apps when they provide bad notifications instead of crashing the system process.
2010-09-23 21:40:24 -07:00
Chung-yih Wang
01a411326e am 1e2df14a: am f43ac911: Merge "Handle OPTIONS requests from SIP servers." into gingerbread
Merge commit '1e2df14a85f098d63b618531db733a21429d4037'

* commit '1e2df14a85f098d63b618531db733a21429d4037':
  Handle OPTIONS requests from SIP servers.
2010-09-23 21:39:49 -07:00
Dianne Hackborn
846df9f517 resolved conflicts for merge of 8952a448 to master
Change-Id: I9c752a5d10ae8d8e5ead1243b6abd4795204fc0b
2010-09-23 20:33:19 -07:00
Chia-chi Yeh
33460d836f am 658bec95: SDP: remove dead code.
Merge commit '658bec956785e074edc4f6c9fe739c366e37be33' into gingerbread-plus-aosp

* commit '658bec956785e074edc4f6c9fe739c366e37be33':
  SDP: remove dead code.
2010-09-23 19:22:12 -07:00
Chia-chi Yeh
658bec9567 SDP: remove dead code.
Change-Id: I2a5764a2b9cabc54b0ac18666e494c1cb39c4e9b
2010-09-24 10:17:42 +08:00
Hung-ying Tyan
ee813baee4 am 84a357bb: Refactoring SIP classes to get ready for API review.
Merge commit '84a357bb6a8005e1c5e924e96a8ecf310e77c47c' into gingerbread-plus-aosp

* commit '84a357bb6a8005e1c5e924e96a8ecf310e77c47c':
  Refactoring SIP classes to get ready for API review.
2010-09-23 19:10:49 -07:00
Hung-ying Tyan
84a357bb6a Refactoring SIP classes to get ready for API review.
+ replace SipAudioCall and its Listener interfaces with real implementations,
  + remove SipAudioCallImpl.java, most of it is has become part of SipAudioCall,
+ add SipSession and its Listener classes to wrap ISipSession and ISipSessionListener,
+ move SipSessionState to SipSession.State,
+ make SipManager keep context and remove the context argument from many methods of its,
+ rename SipManager.getInstance() to newInstance(),
+ rename constant names for action strings and extra keys to follow conventions,
+ set thread names for debugging purpose.

Change-Id: Ie1790dc0e8f49c06c7fc80d33fec0f673a9c3044
2010-09-24 10:06:59 +08:00
Joe Onorato
982c07e908 am cbb7b05e: Merge "Crash apps when they provide bad notifications instead of crashing the system process." into gingerbread
Merge commit 'cbb7b05e35368b104c27089f5f16640680f567c2' into gingerbread-plus-aosp

* commit 'cbb7b05e35368b104c27089f5f16640680f567c2':
  Crash apps when they provide bad notifications instead of crashing the system process.
2010-09-23 16:55:22 -07:00
Joe Onorato
cbb7b05e35 Merge "Crash apps when they provide bad notifications instead of crashing the system process." into gingerbread 2010-09-23 16:52:28 -07:00
Joe Onorato
eaa0718780 Crash apps when they provide bad notifications instead of crashing the system process.
Bug: 2958415
Change-Id: I9cbef340fb20a64eca8493950b814399c26ce197
2010-09-23 16:49:20 -07:00
Robert Greenwalt
8dcc28be06 Move long Connectivity tasks to handler thread.
Reduce ANR potential.
bug:2942829

Change-Id: I21610b462d5ab91821015cd16eecd86d2c0580d1
2010-09-23 16:43:21 -07:00
Chung-yih Wang
1e2df14a85 am f43ac911: Merge "Handle OPTIONS requests from SIP servers." into gingerbread
Merge commit 'f43ac911379c15b6a1a240a931b0f3cbfb2fae53' into gingerbread-plus-aosp

* commit 'f43ac911379c15b6a1a240a931b0f3cbfb2fae53':
  Handle OPTIONS requests from SIP servers.
2010-09-23 16:40:09 -07:00
Chung-yih Wang
f43ac91137 Merge "Handle OPTIONS requests from SIP servers." into gingerbread 2010-09-23 16:36:18 -07:00
Dianne Hackborn
8952a4488e am 287952c3: Fix issue #3022508: Crash during media scan
Merge commit '287952c35e148811c106bc0f5036eabf20f71562' into gingerbread-plus-aosp

* commit '287952c35e148811c106bc0f5036eabf20f71562':
  Fix issue #3022508: Crash during media scan
2010-09-23 16:04:23 -07:00
Dianne Hackborn
287952c35e Fix issue #3022508: Crash during media scan
Don't kill processes for excessive wake lock use, even if they
are in the background, as long as they have running services.

Also fix some problems with this, such as not noting the kill
in battery stats.

And add killing of processes for cpu usage as well, along with
some optimizations to computing CPU usage.

And fix BatteryWaster to be better behaving for testing these
cases.

Add new "monitor" command to am to watch as the activity manager
does stuff (so we can catch things at the point of ANR).

Finally some miscellaneous debug output for the stuff here, as
well as in progress debugging of an ANR.

Change-Id: Ib32f55ca50fb7486b4be4eb5e695f8f60c882cd1
2010-09-23 15:59:28 -07:00
Dianne Hackborn
eecb5b9873 am 2983e038: am 045398e6: Merge "Fix a deadlock I ran into." into gingerbread
Merge commit '2983e038d189a257f1e5abb9c120bd1feb253773'

* commit '2983e038d189a257f1e5abb9c120bd1feb253773':
  Fix a deadlock I ran into.
2010-09-23 14:20:48 -07:00
Dianne Hackborn
2983e038d1 am 045398e6: Merge "Fix a deadlock I ran into." into gingerbread
Merge commit '045398e6243fa4e83fb6435df4e8ffc6a7487a70' into gingerbread-plus-aosp

* commit '045398e6243fa4e83fb6435df4e8ffc6a7487a70':
  Fix a deadlock I ran into.
2010-09-23 14:17:54 -07:00
Dianne Hackborn
045398e624 Merge "Fix a deadlock I ran into." into gingerbread 2010-09-23 14:15:45 -07:00
Irfan Sheriff
c6c9a7df58 Merge "Add Wifi Protected Setup support" 2010-09-23 11:33:49 -07:00
Chung-yih Wang
0b4d2fb114 Handle OPTIONS requests from SIP servers.
Change-Id: I849d5ea4c4c56a06d25ccdc6b959274c59c47200
2010-09-24 00:53:10 +08:00
Robert Greenwalt
35dcaece11 am 9c38a6dc: am e87ebb08: Merge "Cleanup Netd to prevent getting hung." into gingerbread
Merge commit '9c38a6dc13ba55fccb9c66f347307a1b4ae68105'

* commit '9c38a6dc13ba55fccb9c66f347307a1b4ae68105':
  Cleanup Netd to prevent getting hung.
2010-09-23 09:40:20 -07:00
Irfan Sheriff
5ee89800be Add Wifi Protected Setup support
Add WPS PBC and WPS pin method support with pin obtained
from AP

Bug: 2277571

Change-Id: I6ff8e447ab8c5e59456a55152588fd4d6386c610
2010-09-23 09:13:34 -07:00
Robert Greenwalt
9c38a6dc13 am e87ebb08: Merge "Cleanup Netd to prevent getting hung." into gingerbread
Merge commit 'e87ebb08fba88628a65eae88fc5bc7911cfa7d97' into gingerbread-plus-aosp

* commit 'e87ebb08fba88628a65eae88fc5bc7911cfa7d97':
  Cleanup Netd to prevent getting hung.
2010-09-23 08:48:14 -07:00
Robert Greenwalt
e87ebb08fb Merge "Cleanup Netd to prevent getting hung." into gingerbread 2010-09-23 08:41:21 -07:00
satok
ab751aa085 Add methods for managing subtypes
- added showInputMethodSubtypePicker to public API
-- show the selector dialog for subtypes
- added getter, setter and event handler to InputMethodManagerService
- extract InputMethodSubtype to the top level class for using it in aidl
- TODO: make an enabler for input method subtypes
- TODO: handle the event of changing an input method subtype in LatinIME

Change-Id: I49f8c6675ac4b06511635d14a37bd398738eff33
2010-09-23 16:25:07 +09:00