+fix the unknown call flash for answering an incoming call and
updating the screen if the background call got dropped.
+change the getFirstActiveBgCall to return the call if the state
is not IDLE. This will help to fix unknown flash if the background
call got dropped.
Change-Id: I9803ccebd919acbd5296e7dfde7dc5f29cc9f180
Merge commit 'ee2ef3220fd27a6332acb2f65951a7fe91e9dfa6' into gingerbread-plus-aosp
* commit 'ee2ef3220fd27a6332acb2f65951a7fe91e9dfa6':
Use PhoneBase in the phone list.
also fix delivering bad news before closing a SipAudioCallImpl object so that
apps can get the current audio-call object state before it's closed:
http://b/issue?id=3009262
Change-Id: I94c19dae8b4f252de869e614ec462b19b4ff2077
Merge commit '97963794af1e18674dd111e3ad344d90b16c922c' into gingerbread-plus-aosp
* commit '97963794af1e18674dd111e3ad344d90b16c922c':
SIP: convert enum to static final int.
For bug 3001613.
Only use PhoneBase (not PhoneProxy) in CallManager.
Both PhoneBase and PhoneProxy implement Phone interface,
such as dial(). The real implementation, for
example in GSM, is in GSMPhone extending from PhoneBase.
So that foregroundCall.getPhone() returns GSMPhone obj. On the other hand,
PhoneFactory.getDefaultPhone() returns PhoneProxy obj, which has a class
member of GSMPhone.
Therefore for phone returned by PhoneFacotry, which is used by PhoneApp,
phone.getForegroundCall().getPhone() != phone
Change-Id: I8a304098dd86762aaee56fb3c8b76c883e8c9a4f
Merge commit '1d1583573d2099756bbbeef48d97c280edc393e0' into gingerbread-plus-aosp
* commit '1d1583573d2099756bbbeef48d97c280edc393e0':
SipPhone: do not append SIP domain to PSTN number
+ 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
Merge commit 'd8f3d167353f6c6f6c5cb7a4c8e941c03b8e9511' into gingerbread-plus-aosp
* commit 'd8f3d167353f6c6f6c5cb7a4c8e941c03b8e9511':
Add a new phone state ANSWERING.
The state ANSWERING is set when we answer an incoming sip call, i.e.
sending a 'OK' response to the peer. The state will be set to ACTIVE
once the 'ACK' from peer is received.
Change-Id: I84ee3cc68222eb34e032896ce23f7431d4ad774a
Merge commit '968735e580b7728c6a17aff9b7356f9d74dc6eb3' into gingerbread-plus-aosp
* commit '968735e580b7728c6a17aff9b7356f9d74dc6eb3':
Fixing the NPE in SipPhone
1. Originally CallManager registers for all phone events provided by registerFor interface,
which will cause error msg such as "registerForXXX() in PhoneBase should not be called, CDMAPhone inactive."
for CDMA only events. Register for those events only if phone is CDMA phone.
2. Add registerForPostDialCharacter().
Note, we can't use notifyRegistrants() in handler since we need send
the character that is being processed in msg.arg1.
Change-Id: I48037c8a8e225bb82e203836a041f81f2445f4d8
Merge commit '13f6270eb14b409709c936b828e2a2fd40e427c4' into gingerbread-plus-aosp
* commit '13f6270eb14b409709c936b828e2a2fd40e427c4':
SipAudioCall: use SipErrorCode instead of string in onError()
Merge commit '4565933f03a99750a333e97e95408c404984510f' into gingerbread-plus-aosp
* commit '4565933f03a99750a333e97e95408c404984510f':
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
Merge commit '3d7606aa607b24817e37c264f2141ed7b2d50be0' into gingerbread-plus-aosp
* commit '3d7606aa607b24817e37c264f2141ed7b2d50be0':
SIP: enhance timeout and registration status feedback.
Merge commit '9a3ce10c6cafa4a2528ce9f3fdb6163acf5eb7b2' into gingerbread-plus-aosp
* commit '9a3ce10c6cafa4a2528ce9f3fdb6163acf5eb7b2':
Fix bug 2972138 Lost cell data connection and didn't get it back, DO NOT MERGE.
The problem was ConnectvityService was not notified if a permanent error
occurs on the default apn.
bug: 2972138
Change-Id: I7be17061695ae2ba3571d70f24dcc4fe96d9ede9
To fix bug 2968310.
Handle the operation of hangupForegroundResumeBackground while foreground call and background call come from different phones.
Change-Id: Id83ca1b75031a8391c95c7f8b2be40e9067dd4cd
