drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,781 Commits 1 Branch 0 Tags
Commit Graph

1009 Commits

Author SHA1 Message Date
Hung-ying Tyan
dc7d73783e am 8eac20ea: SIP: implement conference call 
Merge commit '8eac20eacd088793547c56e14d602b28d62fb278' into gingerbread-plus-aosp

* commit '8eac20eacd088793547c56e14d602b28d62fb278':
  SIP: implement conference call
 2010-08-18 13:37:25 -07:00
Hung-ying Tyan
16848a15bb am f6354aca: Merge "CallManager: do not deliver ring event if fg call is live." into gingerbread 
Merge commit 'f6354aca3a4d0571a66747d9cdc247a1d411d660' into gingerbread-plus-aosp

* commit 'f6354aca3a4d0571a66747d9cdc247a1d411d660':
  CallManager: do not deliver ring event if fg call is live.
 2010-08-18 13:37:11 -07:00
Xia Wang
0dde515777 Merge "Add setRadioState to MockRilController and the corresponding test case. Add test case for setRadioState command in Mock Ril" 2010-08-18 09:45:45 -07:00
Hung-ying Tyan
a4cb657e3a CallManager: add setAudioMode() 
When in a call, different audio modes need to be applied based on phone type.
(For example, SIP call needs to be in MODE_NORMAL while GSM call in MODE_IN_CALL.)
Originally, it's handled in PhoneUtils.setAudioMode(). It makes more sense now
to handle the actual logic in CallManager.

Change-Id: I58d8f31d6b4afe22f88da442daac2010781de801
 2010-08-18 10:21:10 +08:00
Hung-ying Tyan
8eac20eacd SIP: implement conference call 
Change-Id: Ifd420ed95e77e744c6aff28ac63e7363f97d9dc6
 2010-08-18 10:00:36 +08:00
Hung-ying Tyan
912e0f7d9e CallManager: do not deliver ring event if fg call is live. 
Change-Id: If5b1bca1f09557a2ee4de9ba429d80a0393279a0
 2010-08-17 17:52:34 +08:00
Georgios Katsaros
0b2bbacd9b Adds the ability to Android to initiate a 2 Digit Call. 
Over here the phone number to the switch-board is "99". Trying
to call "99" on an Android device dont work as expected (it
works on other devices though).

Exception (1) to Call initiation is:
  If the user of the device is already in a call and enters a
  Short String without any #-key at the end and the length of
  the Short String is equal or less than 2 the phone shall
  initiate a USSD/SS commands.

Exception (2) to Call initiation is:
  If the user of the device enters one digit followed by the
  #-key. This rule defines this String as the "#-String" which
  is a USSD/SS command. The phone shall initiate a USSD/SS
  commands.

Change-Id: I950ac10b347b8e9d113d208b08c3e2c7cdb50221
 2010-08-17 08:37:02 +02:00
Jake Hamby
a774f5817b resolved conflicts for merge of 31202b1a to master 
Change-Id: Ia8ae32c5ebcd13843ed9cc82c80bf551b38e586f
 2010-08-16 14:42:01 -07:00
Jake Hamby
c93ba8ed0d am 164eb050: am 4f170821: Merge "Fix typo and bug in CTS test class." into gingerbread 
Merge commit '164eb050bdbaacb83e48a00c56b78d3c587a6e34'

* commit '164eb050bdbaacb83e48a00c56b78d3c587a6e34':
  Fix typo and bug in CTS test class.
 2010-08-16 07:49:44 -07:00
Jake Hamby
31202b1a40 am 3f442ece: Merge "Fix character count bug and Javadoc typos in SMS (with test cases)" into gingerbread 
Merge commit '3f442ece257d416b48f7803a4cc263f0215faa0d' into gingerbread-plus-aosp

* commit '3f442ece257d416b48f7803a4cc263f0215faa0d':
  Fix character count bug and Javadoc typos in SMS (with test cases)
 2010-08-13 15:19:11 -07:00
Jake Hamby
164eb050bd am 4f170821: Merge "Fix typo and bug in CTS test class." into gingerbread 
Merge commit '4f170821678099010ec593d2b5a081e0f8adf92d' into gingerbread-plus-aosp

* commit '4f170821678099010ec593d2b5a081e0f8adf92d':
  Fix typo and bug in CTS test class.
 2010-08-13 14:53:03 -07:00
Jake Hamby
17f616823a Fix character count bug and Javadoc typos in SMS (with test cases) 
Fix a character count bug I discovered while working on related SMS
bugs. Includes a new set of test cases to verify the fix for the
buggy calculateLength() methods ("runtest frameworks-telephony").

You can also verify that the counter works properly in the Mms app
by typing characters until the boundary is crossed where an
additional message part is required. The counter should count down
to 0 characters remaining before increasing the message count.

Change-Id: I4de68b82dfc53dcae094865798f2c0235a355d43
 2010-08-13 14:01:31 -07:00
Jake Hamby
a8f39537ca Fix typo and bug in CTS test class. 
- Fix Javadoc typo in PhoneSubInfo.java
- Fix ArrayIndexOutOfBoundsException in SimulatedCommands.java

Change-Id: I40dcd52cf9d6990f1f845fca5c1d61cdff93f4d7
 2010-08-13 12:16:15 -07:00
Dmitri Plotnikov
3e4b7c332f Keep the '+' when normalizing the phone number 
Change-Id: I24731735ed18dbc92a643a0d99d35a1b58be40c8
 2010-08-13 11:09:29 -07:00
John Wang
c178b95c1f am 2835391c: am 686a9505: Merge "Update switch call and accept call." into gingerbread 
Merge commit '2835391c1709a2b655940200dab0fc74ef08512d'

* commit '2835391c1709a2b655940200dab0fc74ef08512d':
  Update switch call and accept call.
 2010-08-12 17:35:53 -07:00
John Wang
2835391c17 am 686a9505: Merge "Update switch call and accept call." into gingerbread 
Merge commit '686a95055896c221c62fe7f4c3dda137809df91e' into gingerbread-plus-aosp

* commit '686a95055896c221c62fe7f4c3dda137809df91e':
  Update switch call and accept call.
 2010-08-12 17:33:19 -07:00
John Wang
c159c84699 Update switch call and accept call. 
Change-Id: Ifdd1af77e3eca08f6c931605ecfb275835b78709
 2010-08-12 14:52:39 -07:00
John Huang
81a81f02d6 am edfe20c4: am c636b846: Merge "Enhance WspTypeDecoder to decode Content Type Parameters" 
Merge commit 'edfe20c4bd04716420a47516959d7c0e3e0064f6'

* commit 'edfe20c4bd04716420a47516959d7c0e3e0064f6':
  Enhance WspTypeDecoder to decode Content Type Parameters
 2010-08-12 10:32:39 -07:00
John Huang
edfe20c4bd am c636b846: Merge "Enhance WspTypeDecoder to decode Content Type Parameters" 
Merge commit 'c636b846160482fbebd9a3792d52b9ff864228f2' into gingerbread-plus-aosp

* commit 'c636b846160482fbebd9a3792d52b9ff864228f2':
  Enhance WspTypeDecoder to decode Content Type Parameters
 2010-08-12 10:26:58 -07:00
John Huang
c636b84616 Merge "Enhance WspTypeDecoder to decode Content Type Parameters" 2010-08-12 10:07:06 -07:00
Hung-ying Tyan
4ff4a1fa87 SIP: remove unused file. 
Change-Id: If173fed70080de7d903bc176d91bd94338c4fdcb
 2010-08-12 16:10:49 +08:00
Naveen Kalla
cd397b73a8 am 371dbcba: am c4c4c98c: In CW Interrogation service class is not sent. 
Merge commit '371dbcba11070ed2fdd58a4c328b5d7b9ad65a40'

* commit '371dbcba11070ed2fdd58a4c328b5d7b9ad65a40':
  In CW Interrogation service class is not sent.
 2010-08-11 09:56:05 -07:00
Naveen Kalla
371dbcba11 am c4c4c98c: In CW Interrogation service class is not sent. 
Merge commit 'c4c4c98c5ca6b4c017a5b429a6bd80a440c63559' into gingerbread-plus-aosp

* commit 'c4c4c98c5ca6b4c017a5b429a6bd80a440c63559':
  In CW Interrogation service class is not sent.
 2010-08-11 09:53:01 -07:00
Jean-Baptiste Queru
5a90f6f594 am 92798a48: am 076d0654: Merge "SIM toolkit enhancements and bug fixes" 
Merge commit '92798a481cbd928711339606bc1d9e81fa80f7b2'

* commit '92798a481cbd928711339606bc1d9e81fa80f7b2':
  SIM toolkit enhancements and bug fixes
 2010-08-11 09:52:34 -07:00
Jean-Baptiste Queru
92798a481c am 076d0654: Merge "SIM toolkit enhancements and bug fixes" 
Merge commit '076d06547f90c480a4ed19da6f4b3d1270f57ec9' into gingerbread-plus-aosp

* commit '076d06547f90c480a4ed19da6f4b3d1270f57ec9':
  SIM toolkit enhancements and bug fixes
 2010-08-11 09:44:27 -07:00
Naveen Kalla
c4c4c98c5c In CW Interrogation service class is not sent. 
As per 3GPP TS 24.083, section 1.6 UE doesn't need to send service class
parameter in call waiting interrogation  to network. Some networks return error
if service class is sent. So setting service class to SERVICE_CLASS_NONE.

Change-Id: I396963d568573b88795ad2cf1844eb2e047b459e
 2010-08-11 09:44:04 -07:00
Hung-ying Tyan
03381faf34 am 1777a274: SIP: remove unused file. 
Merge commit '1777a2748bfa25dfd9d081d71504572b9a7256b1' into gingerbread-plus-aosp

* commit '1777a2748bfa25dfd9d081d71504572b9a7256b1':
  SIP: remove unused file.
 2010-08-11 01:56:56 -07:00
Hung-ying Tyan
1777a2748b SIP: remove unused file. 
Change-Id: Ifb3582da888926e62775a73a6b3080d15f1c3e42
 2010-08-11 16:48:14 +08:00
Chung-yih Wang
ea65ec23f6 am 0a6db9be: am 2725a655: Fix a bug in unregisterPhone(). 
Merge commit '0a6db9bebbd58c6a7e2ad2070d2649a2be57a09a'

* commit '0a6db9bebbd58c6a7e2ad2070d2649a2be57a09a':
  Fix a bug in unregisterPhone().
 2010-08-10 23:44:52 -07:00
Chung-yih Wang
0a6db9bebb am 2725a655: Fix a bug in unregisterPhone(). 
Merge commit '2725a6551261044318e42ccc9ebeabed7edf5ee7' into gingerbread-plus-aosp

* commit '2725a6551261044318e42ccc9ebeabed7edf5ee7':
  Fix a bug in unregisterPhone().
 2010-08-10 23:41:48 -07:00
Chung-yih Wang
2725a65512 Fix a bug in unregisterPhone(). 
Change-Id: Ifaef66d45043dc5376688a77f9d18124a9c29576
 2010-08-11 14:22:34 +08:00
Chung-yih Wang
a5d4503bc4 am 2c9de2b9: am f57324cf: Add getSipUri() for identification. 
Merge commit '2c9de2b9e5568c8918b36866d3cf20833a8c20e1'

* commit '2c9de2b9e5568c8918b36866d3cf20833a8c20e1':
  Add getSipUri() for identification.
 2010-08-10 21:54:01 -07:00
Chung-yih Wang
2c9de2b9e5 am f57324cf: Add getSipUri() for identification. 
Merge commit 'f57324cf4f82947296f4d1acb9df1f3c9c03134e' into gingerbread-plus-aosp

* commit 'f57324cf4f82947296f4d1acb9df1f3c9c03134e':
  Add getSipUri() for identification.
 2010-08-10 20:47:18 -07:00
Chung-yih Wang
f57324cf4f Add getSipUri() for identification. 
Change-Id: Iabffd38ad554c34a34977c833e6699747cbf0f63
 2010-08-11 11:13:49 +08:00
Hung-ying Tyan
1601400b58 am f13542f2: am 259b4c86: Merge "SIP: clean up unused class and fields." into gingerbread 
Merge commit 'f13542f2eba27d9b09ba6aa313f758e5518caa00'

* commit 'f13542f2eba27d9b09ba6aa313f758e5518caa00':
  SIP: clean up unused class and fields.
 2010-08-09 22:44:37 -07:00
Hung-ying Tyan
f13542f2eb am 259b4c86: Merge "SIP: clean up unused class and fields." into gingerbread 
Merge commit '259b4c860212dd528b25d1cce6e74be01afed85c' into gingerbread-plus-aosp

* commit '259b4c860212dd528b25d1cce6e74be01afed85c':
  SIP: clean up unused class and fields.
 2010-08-09 22:37:46 -07:00
Hung-ying Tyan
8e63ddb4c7 SIP: clean up unused class and fields. 
Change-Id: I79ed7fb324fea9a52946340055b5ea1d389a926a
 2010-08-10 12:00:45 +08:00
Hung-ying Tyan
a36cb1ebb5 am 8b8b4536: am 8fb2e6e4: PhoneFactory: add makeSipPhone() 
Merge commit '8b8b4536314d1354c244af2c9e665c4db4e27522'

* commit '8b8b4536314d1354c244af2c9e665c4db4e27522':
  PhoneFactory: add makeSipPhone()
 2010-08-09 20:00:05 -07:00
Hung-ying Tyan
f21d4ed7b8 am 51128faa: am d122805b: CallManager: add getAllPhones(). 
Merge commit '51128faa8cf1f3d25ee7db745b9e18e69e04cd31'

* commit '51128faa8cf1f3d25ee7db745b9e18e69e04cd31':
  CallManager: add getAllPhones().
 2010-08-09 19:59:43 -07:00
Hung-ying Tyan
8b8b453631 am 8fb2e6e4: PhoneFactory: add makeSipPhone() 
Merge commit '8fb2e6e4720385961083a150a3e848ccaef544ae' into gingerbread-plus-aosp

* commit '8fb2e6e4720385961083a150a3e848ccaef544ae':
  PhoneFactory: add makeSipPhone()
 2010-08-09 19:52:28 -07:00
Hung-ying Tyan
51128faa8c am d122805b: CallManager: add getAllPhones(). 
Merge commit 'd122805bbfcb770f941cac259bcefafdb2d3ad56' into gingerbread-plus-aosp

* commit 'd122805bbfcb770f941cac259bcefafdb2d3ad56':
  CallManager: add getAllPhones().
 2010-08-09 19:52:19 -07:00
Xia Wang
e9be34c227 Add setRadioState to MockRilController and the corresponding test case. 
Add test case for setRadioState command in Mock Ril

Change-Id: I6934bc291f58743d98295b816600a6e7b980bdb1
 2010-08-09 17:00:17 -07:00
Hung-ying Tyan
8fb2e6e472 PhoneFactory: add makeSipPhone() 
Change-Id: I8e7abb0623724d24c6f82829ff06663a31ba32fb
 2010-08-09 17:15:35 +08:00
Hung-ying Tyan
d122805bbf CallManager: add getAllPhones(). 
Change-Id: I50589aaec55925d93c392f15a22c70d2a6634b87
 2010-08-09 16:14:15 +08:00
John Huang
928245d16f Merge "Add supporting MCC=450(Korea)" 2010-08-06 10:02:08 -07:00
Chung-yih Wang
88e590fb37 Fix the SipPhone codes related to the ITelephone interface change. 
Change-Id: Id8ab7a6e4feaac67cd09e8412af61b40c6e774b4
 2010-08-06 13:36:10 +08:00
Chung-yih Wang
e6747b6787 am e7b92260: am b9605886: Merge "Revert "Revert "Move SIP telephony related codes to framework.""" into gingerbread 
Merge commit 'e7b92260e228039295874bea024b629cb5a4d89a'

* commit 'e7b92260e228039295874bea024b629cb5a4d89a':
  Revert "Revert "Move SIP telephony related codes to framework.""
 2010-08-05 21:11:09 -07:00
Chung-yih Wang
e7b92260e2 am b9605886: Merge "Revert "Revert "Move SIP telephony related codes to framework.""" into gingerbread 
Merge commit 'b9605886d1a94de624b6feb5a81bb37f41653437' into gingerbread-plus-aosp

* commit 'b9605886d1a94de624b6feb5a81bb37f41653437':
  Revert "Revert "Move SIP telephony related codes to framework.""
 2010-08-05 19:38:04 -07:00
Chung-yih Wang
e2dd8ca719 am bc088dde: am cde66df4: Revert "Move SIP telephony related codes to framework." 
Merge commit 'bc088ddecb05de39f7e96e44de394add975baecd'

* commit 'bc088ddecb05de39f7e96e44de394add975baecd':
  Revert "Move SIP telephony related codes to framework."
 2010-08-05 12:08:43 -07:00
Chung-yih Wang
e066684a1b am d088cef7: am 468e35ef: Merge "Move SIP telephony related codes to framework." into gingerbread 
Merge commit 'd088cef7da5f17b6d1ea16196c24032f39c9eb32'

* commit 'd088cef7da5f17b6d1ea16196c24032f39c9eb32':
  Move SIP telephony related codes to framework.
 2010-08-05 12:08:30 -07:00