History log of /frameworks/base/telephony/java/com/android/internal/telephony/sip/SipPhoneBase.java
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
ecd302259a66aaf5abd49407c379c066e2542e95 19-Apr-2012 Wink Saville <wink@google.com> Revert "Telephony: Dynamically instantiate IccCard"

This reverts commit fe37acae729529b8bf3a3140fa397bddce42b1e0

There are two bugs that are weekend release blockers:

b/6357558
b/6357880

6357558 is easily fixed with:

https://android-git.corp.google.com/g/#/c/182228/

But there are still questions. Bug 6357880 has
unknown causes at the moment but this change is the
most likely candidate. So for today's pre-weekend
build we are reverting this change.
/frameworks/base/telephony/java/com/android/internal/telephony/sip/SipPhoneBase.java
fe37acae729529b8bf3a3140fa397bddce42b1e0 17-Apr-2012 Alex Yakavenka <ayakaven@quicinc.com> Telephony: Dynamically instantiate IccCard

Change-Id: I8c4d800158fb1eb12de66d437cb0d76695ff98d3
/frameworks/base/telephony/java/com/android/internal/telephony/sip/SipPhoneBase.java
2ea7e443b27ff185104b8a8b5e7a08b5510125bd 12-Jul-2011 John Wang <johnwang@google.com> Add getImei() to Phone interface.

Need IMEI to be displayed in LTE Settings. Since getDeviceId() returns MEID for LTE device,
getImei() is added to return IMEI for all devices. getImei returns null if not set (as SipPhone).

bug:4983512
Change-Id: Idfe2ec8de514f330248db7a9de7e241f9a38cb96
/frameworks/base/telephony/java/com/android/internal/telephony/sip/SipPhoneBase.java
3caa1bd1061df4029951e68d0a04d5e30928701f 15-Jan-2011 Robert Greenwalt <rgreenwalt@google.com> Moving gsm.NetworkInfo to OperatorInfo

NetworkInfo had a bad name collision, wasn't gsm specific and was
really about operators.

Change-Id: Ic99108a3d0e2b3115f023398f85d9c7e5a3e38be
/frameworks/base/telephony/java/com/android/internal/telephony/sip/SipPhoneBase.java
5644b080741bb4fae103617ecbea7a62b0262a56 17-Nov-2010 Kenny Root <kroot@google.com> Don't waste resources creating new Boolean objects

There's a static Boolean.TRUE and Boolean.FALSE that can be used without
instantiating a new Boolean object unnecessarily.

Change-Id: I30a6c6514faae0ebeb6b571bf741db6814b8cc78
/frameworks/base/telephony/java/com/android/internal/telephony/sip/SipPhoneBase.java
aeba1bc0c333f145469fc17a10c0bbcebd6dc30b 02-Oct-2010 Hung-ying Tyan <tyanh@google.com> Revert "Revert "resolved conflicts for merge of 8788d140 to master""

This reverts commit bdf11be97bd732e8891ae19342c937da6e659afa.
Fix a missing import from manual merge.

Change-Id: If373626f07250cbfe07e5c04cf02ad9ee5a0ab2a
/frameworks/base/telephony/java/com/android/internal/telephony/sip/SipPhoneBase.java
bdf11be97bd732e8891ae19342c937da6e659afa 02-Oct-2010 Jason Chen <jasonchen@google.com> Revert "resolved conflicts for merge of 8788d140 to master"

This reverts commit 2874c3dec4f9ffd59b2be3de62c1148534396828, reversing
changes made to 7afbb30d636351334d101fd0caef391fa409230d.
/frameworks/base/telephony/java/com/android/internal/telephony/sip/SipPhoneBase.java
2874c3dec4f9ffd59b2be3de62c1148534396828 01-Oct-2010 Hung-ying Tyan <tyanh@google.com> resolved conflicts for merge of 8788d140 to master

Change-Id: I7eaf2b7fe968e8d4cf6c5a2a4e66b8584c1dc78c
306137d97f40a4f807c54a75210343c9262360d1 01-Oct-2010 Hung-ying Tyan <tyanh@google.com> SIP telephony cleanup.

+ Remove unused classes.
+ Remove unused imports.
+ Remove unused code.
+ add DEBUG flag.

Change-Id: Ie1236d909d971093b68b066d3d8c1857ac89f56f
/frameworks/base/telephony/java/com/android/internal/telephony/sip/SipPhoneBase.java
6b15ecf2787dd0fa8e119785495112a84c30afe0 21-Sep-2010 Chung-yih Wang <cywang@google.com> am 232bc085: am 708e4251: Merge "Revert the ANSWERING state." into gingerbread

Merge commit '232bc085fc901b6234d47c4ee4e3ee4fc88431e7'

* commit '232bc085fc901b6234d47c4ee4e3ee4fc88431e7':
Revert the ANSWERING state.
9779b714f4035642b87cbb7ef6cd8ac32848c930 19-Sep-2010 Chung-yih Wang <cywang@google.com> Revert the ANSWERING state.

+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
/frameworks/base/telephony/java/com/android/internal/telephony/sip/SipPhoneBase.java
d6e15ab6aa387958222407b97cd21ae1d8b7965b 16-Sep-2010 Chung-yih Wang <cywang@google.com> am 170255b0: am d8f3d167: Add a new phone state ANSWERING.

Merge commit '170255b0f0482baf843b881a02d9361adcc33742'

* commit '170255b0f0482baf843b881a02d9361adcc33742':
Add a new phone state ANSWERING.
d8f3d167353f6c6f6c5cb7a4c8e941c03b8e9511 16-Sep-2010 Chung-yih Wang <cywang@google.com> 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
/frameworks/base/telephony/java/com/android/internal/telephony/sip/SipPhoneBase.java
8fbc471199b157d40d709dbde6ea538a16444cfc 08-Sep-2010 Hung-ying Tyan <tyanh@google.com> am f870ee81: am d580eee2: Merge "SipPhone: switch to its own phone type PHONE_TYPE_SIP." into gingerbread

Merge commit 'f870ee81089ddf5e0388f8b4c7b6a1d437d39ce0'

* commit 'f870ee81089ddf5e0388f8b4c7b6a1d437d39ce0':
SipPhone: switch to its own phone type PHONE_TYPE_SIP.
8744f879852a74885e1c56a65cd65a28b6a5fa7a 07-Sep-2010 Hung-ying Tyan <tyanh@google.com> SipPhone: switch to its own phone type PHONE_TYPE_SIP.

Change-Id: Ie33cfe92e59665864dbebbb38895e8e85f6db2e6
/frameworks/base/telephony/java/com/android/internal/telephony/sip/SipPhoneBase.java
37e65ebb7eb932e1a144b1cab262e11ca5fd109b 30-Aug-2010 Robert Greenwalt <robdroid@android.com> Rename NetworkProperties to LinkProperties

Also add copy constructors and use them when giving out data.

Change-Id: Id320eb8fb91d0bd250305ce7bb4f628570215615
/frameworks/base/telephony/java/com/android/internal/telephony/sip/SipPhoneBase.java
63134b3aee2143c6df1ae9e2f8e4d516e26a0e2a 24-Aug-2010 Hung-ying Tyan <tyanh@google.com> am 1537637c: am 3294d44b: Add confcall management to SIP calls

Merge commit '1537637cc443a48e9afb8091b6f2ce329318f2d7'

* commit '1537637cc443a48e9afb8091b6f2ce329318f2d7':
Add confcall management to SIP calls
3294d44b96f63f647fba3a03604eb028e28a42bc 18-Aug-2010 Hung-ying Tyan <tyanh@google.com> Add confcall management to SIP calls

and fix the bug of re-assigning connectTime's in SipConnection,
and adding synchronization for SipPhone to be thread-safe,
and set normal audio mode when call not on hold instead of on hold in SipAudioCallImpl,
and fix re-entrance problem in CallManager.setAudioMode() for in-call mode.

Change-Id: I54f39dab052062de1ce141e5358d892d30453a3a
/frameworks/base/telephony/java/com/android/internal/telephony/sip/SipPhoneBase.java
88e590fb370d80d863417aae9330c8c2218f3175 06-Aug-2010 Chung-yih Wang <cywang@google.com> Fix the SipPhone codes related to the ITelephone interface change.

Change-Id: Id8ab7a6e4feaac67cd09e8412af61b40c6e774b4
/frameworks/base/telephony/java/com/android/internal/telephony/sip/SipPhoneBase.java
ccd0b6953f5f77d1da5f540a3ba5ea71116e14f0 05-Aug-2010 Chung-yih Wang <cywang@google.com> Revert "Revert "Move SIP telephony related codes to framework.""

This reverts commit cde66df44240cfe5a7bec12ac52464c3bf26c14f.

Change-Id: I87da883b45350ec8f7da71e9bd392b075ea30ca7
/frameworks/base/telephony/java/com/android/internal/telephony/sip/SipPhoneBase.java
cde66df44240cfe5a7bec12ac52464c3bf26c14f 05-Aug-2010 Chung-yih Wang <cywang@google.com> Revert "Move SIP telephony related codes to framework."

This reverts commit b631dcf3eb449ddec756bea330f4e70b996ffb9e.
/frameworks/base/telephony/java/com/android/internal/telephony/sip/SipPhoneBase.java
b631dcf3eb449ddec756bea330f4e70b996ffb9e 05-Aug-2010 Chung-yih Wang <cywang@google.com> Move SIP telephony related codes to framework.

+ hardcode the sip service for build dependency.

Change-Id: Ib0e9717c9b87eb6e06ffa3a7b01ae31184de61bb
/frameworks/base/telephony/java/com/android/internal/telephony/sip/SipPhoneBase.java