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
Mark Piper
77b02e776d
Fix compile errors in telephony tests
...
Simple fix of package names for two test cases, currently
they do not compile in an IDE.
Change-Id: Ia7cd4df70ff37875a02563cfddbe8dd4a16a5b01
2010-08-06 21:18:06 +01: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
Chung-yih Wang
ccd0b6953f
Revert "Revert "Move SIP telephony related codes to framework.""
...
This reverts commit cde66df44240cfe5a7bec12ac52464c3bf26c14f.
Change-Id: I87da883b45350ec8f7da71e9bd392b075ea30ca7
2010-08-05 14:21:19 +08:00
Chung-yih Wang
bc088ddecb
am cde66df4: Revert "Move SIP telephony related codes to framework."
...
Merge commit 'cde66df44240cfe5a7bec12ac52464c3bf26c14f' into gingerbread-plus-aosp
* commit 'cde66df44240cfe5a7bec12ac52464c3bf26c14f':
Revert "Move SIP telephony related codes to framework."
2010-08-04 22:33:08 -07:00
Chung-yih Wang
cde66df442
Revert "Move SIP telephony related codes to framework."
...
This reverts commit b631dcf3eb449ddec756bea330f4e70b996ffb9e.
2010-08-05 13:25:38 +08:00
Chung-yih Wang
d088cef7da
am 468e35ef: Merge "Move SIP telephony related codes to framework." into gingerbread
...
Merge commit '468e35efc595114354eff7ee2685ea79ed098c7f' into gingerbread-plus-aosp
* commit '468e35efc595114354eff7ee2685ea79ed098c7f':
Move SIP telephony related codes to framework.
2010-08-04 21:18:57 -07:00
Chung-yih Wang
b631dcf3eb
Move SIP telephony related codes to framework.
...
+ hardcode the sip service for build dependency.
Change-Id: Ib0e9717c9b87eb6e06ffa3a7b01ae31184de61bb
2010-08-05 11:11:58 +08:00
John Wang
efd938f77a
am 62f066a1: Merge "Add register methods in CallManager "do not merge"" into gingerbread
...
Merge commit '62f066a14afb2774569a54c150a9d0a2601dd77a' into gingerbread-plus-aosp
* commit '62f066a14afb2774569a54c150a9d0a2601dd77a':
Add register methods in CallManager "do not merge"
2010-08-04 18:56:37 -07:00
John Wang
62f066a14a
Merge "Add register methods in CallManager "do not merge"" into gingerbread
2010-08-04 18:54:55 -07:00
Xia Wang
a69fbc8eff
Switch to new enum definition in RilCmds
...
Change-Id: Id6173d92a1c8d136b037448e2df55ea9ef49d34e
2010-08-04 15:39:24 -07:00
jsh
0b4e3ad356
am 82cadee3: Merge "Add support for PSC of serving cell." into gingerbread
...
Merge commit '82cadee3ca830315c617dfdbf3a8eef207c58436' into gingerbread-plus-aosp
* commit '82cadee3ca830315c617dfdbf3a8eef207c58436':
Add support for PSC of serving cell.
2010-08-04 14:35:44 -07:00
jsh
05a5a88a17
Add support for PSC of serving cell.
...
Bug: 2465036
2010-08-03 14:50:18 -07:00
John Wang
0b80ac9825
Add register methods in CallManager "do not merge"
...
Cherry-picked from master.
Add register methods used by PhoneApp into CallManager class.
For most register methods, CallManager acts as an pass-through
register to handle register and unregister phone case.
Change-Id: I9567c2dbffb9e482b906f94c2d991a404ad4626e
2010-08-02 15:33:48 -07:00
John Wang
e0b35c6d44
am 8bffa72b: Merge changes Ic30e2801,I387bab4d into gingerbread
...
Merge commit '8bffa72b9c711fec231108977ad9f2ba72678a82' into gingerbread-plus-aosp
* commit '8bffa72b9c711fec231108977ad9f2ba72678a82':
Handle call list in CallManager "do not merge".
Create CallManager class "do not merge"
2010-08-02 15:33:47 -07:00
John Wang
4de9d20260
Handle call list in CallManager "do not merge".
...
Cherry-picked from master.
Update APIs to access foregroudCalls, backgroudCalls, and ringingCalls
* 1. APIs to access list of calls
* 2. APIs to check if any active call, which has connection other than
* disconnected ones, pleaser refer to Call.isIdle()
* 3. APIs to return first active call
* 4. APIs to return the connections of first active call
* 5. APIs to return other property of first active call
Change-Id: Ic30e28018d14e496e9427f96fec8a7c2ff7c1549
2010-08-02 15:18:17 -07:00
John Wang
ccd88b6594
Create CallManager class "do not merge"
...
Cherry-pick from master.
Initial check-in to support multiple call channels.
Change-Id: I387bab4d69ee38d738c5e0e0a51f1ac6607b9759
2010-08-02 15:13:53 -07:00
Xia Wang
3208c26f6d
Merge "Create Mock Ril Controller as a static library, Generate a simple test case using the controller, wrap tests uing mockril in a seperate package."
2010-08-02 14:52:21 -07:00
Xia Wang
237e594402
Create Mock Ril Controller as a static library,
...
Generate a simple test case using the controller,
wrap tests uing mockril in a seperate package.
Change-Id: Iae9422ec30963aae79cc1b58e17df6cff16955c8
2010-08-02 12:20:30 -07:00
Wink Saville
ae2036a8f9
am 7472c219: am 1540a7ea: am c69f5be0: Add PhoneSubInfo.getCompleteVoiceMailNumber.
...
Merge commit '7472c219a13e3f9f74d9a4adf1478e9c4f9248a2'
* commit '7472c219a13e3f9f74d9a4adf1478e9c4f9248a2':
Add PhoneSubInfo.getCompleteVoiceMailNumber.
2010-08-02 12:09:03 -07:00
Wink Saville
7472c219a1
am 1540a7ea: am c69f5be0: Add PhoneSubInfo.getCompleteVoiceMailNumber.
...
Merge commit '1540a7ea1afcb772b5fcf90f635153f6489eb8ed' into gingerbread-plus-aosp
* commit '1540a7ea1afcb772b5fcf90f635153f6489eb8ed':
Add PhoneSubInfo.getCompleteVoiceMailNumber.
2010-08-02 12:06:34 -07:00
Wink Saville
1540a7ea1a
am c69f5be0: Add PhoneSubInfo.getCompleteVoiceMailNumber.
...
Merge commit 'c69f5be0ed3529564e5db6874de52775c2c99007' into gingerbread
* commit 'c69f5be0ed3529564e5db6874de52775c2c99007':
Add PhoneSubInfo.getCompleteVoiceMailNumber.
2010-08-02 12:02:42 -07:00
Wink Saville
c69f5be0ed
Add PhoneSubInfo.getCompleteVoiceMailNumber.
...
PhoneSubInfo.getVoiceMailNumber now returns only the network
portion of the voicemail number. Use the new method
PhoneSubInfo.getCompleteVoiceMailNumber to get the netowrk
portion and the post dial portion.
Bug: 2881483
Change-Id: I7637d4fa0ffa046b4eebc4d599719bb668c940b5
2010-08-02 11:07:51 -07:00
Dan Griffin
c9790716f0
Enhance WspTypeDecoder to decode Content Type Parameters
...
This patch enables WspTypeDecoder to correctly parse content type
parameters as described in the Wap230 WSP specifications
(wap-230-wsp-20010705-a section 8.4.2.24) which are then passed on
as part of the WAP_PUSH intent notification.
It also recognises all Well Known WSP Content types, and simplifies
their retrieval (i.e. a well known content type will always be
available through the WspTypeDecoder.getValueString() method).
Change-Id: I0eb3f9ac287aa7cb53312777c4be54b1939fa857
2010-08-02 17:44:04 +08:00
Naveen Kalla
e4866d0165
SIM toolkit enhancements and bug fixes
...
- Correct the Terminal response for GET_INKEY variable timeout.
GCF PTCRB Testcase GCF_PTCRB_USAT_GetInkey_27.22.4.2.8.1 checks for
DURATION TLV in the terminal response. Add DURATION TLV in the terminal
response for GET INKEY.
- According to TS 102.223/TS 31.111 section 6.8, Structure of TERMINAL RESPONSE,
"For all SIMPLE-TLV objects with Min=N, the ME should set the
CR(comprehension required) flag to comprehension not required.(CR=0)"
Since DEVICE_IDENTITIES and DURATION TLVs have Min=N, the CR flag is not set.
- Add support for Provide Local Information(PLI) Language setting. Send
terminal reponse with the locale language setting value read from
"persist.sys.language" system property.
- Send TR with BEYOND_TERMINAL_CAPABILITY for unsupported proactive commands
- Fix length coding for Text String in terminal response for GET INPUT.
Change-Id: I762b064f02f44772809f8bb029e8cefb838e7766
2010-07-30 19:34:25 -07:00
Alex Yakavenka
01f51d3645
am 42b23da9: am a27353c1: Cat: Generalize stk into cat
...
Merge commit '42b23da99ba0679b40bcd402dcc04266a71e7d30'
* commit '42b23da99ba0679b40bcd402dcc04266a71e7d30':
Cat: Generalize stk into cat
2010-07-30 11:07:45 -07:00
Alex Yakavenka
42b23da99b
am a27353c1: Cat: Generalize stk into cat
...
Merge commit 'a27353c1965911f69be8d02a01b15389189eab9d' into gingerbread-plus-aosp
* commit 'a27353c1965911f69be8d02a01b15389189eab9d':
Cat: Generalize stk into cat
2010-07-30 11:05:26 -07:00
Jean-Baptiste Queru
5ea2a2e055
am b3311567: am 3d9e1696: Merge "Cat: Move Stk imlpementation into Cat folder"
...
Merge commit 'b3311567017d2653fd5530a91c1de5436706c5e9'
* commit 'b3311567017d2653fd5530a91c1de5436706c5e9':
Cat: Move Stk imlpementation into Cat folder
2010-07-30 10:58:12 -07:00