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
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
Jean-Baptiste Queru
87623088c8
am 257c696f: am d8d03c89: Merge "Ccat: Initial CCAT implementation"
...
Merge commit '257c696ff7155ebb71659e0a49761b76049d9ed8'
* commit '257c696ff7155ebb71659e0a49761b76049d9ed8':
Ccat: Initial CCAT implementation
2010-07-30 10:58:00 -07:00
Jean-Baptiste Queru
b331156701
am 3d9e1696: Merge "Cat: Move Stk imlpementation into Cat folder"
...
Merge commit '3d9e1696ed5e68d5a834e3c3217e3226cfac5b6c' into gingerbread-plus-aosp
* commit '3d9e1696ed5e68d5a834e3c3217e3226cfac5b6c':
Cat: Move Stk imlpementation into Cat folder
2010-07-30 10:55:02 -07:00
Jean-Baptiste Queru
257c696ff7
am d8d03c89: Merge "Ccat: Initial CCAT implementation"
...
Merge commit 'd8d03c890b03f063bdb669e25742b4f4c69d2bcf' into gingerbread-plus-aosp
* commit 'd8d03c890b03f063bdb669e25742b4f4c69d2bcf':
Ccat: Initial CCAT implementation
2010-07-30 10:54:59 -07:00
Alex Yakavenka
a27353c196
Cat: Generalize stk into cat
...
Rename all stk classes, comments and variables into cat classes.
Cat (Card Application Toolkit) is the common class that has
functionality of both Stk and Ccat.
Change-Id: Id0b99d0d9f4b0ce49adcb436060f13d5341ab8ab
2010-07-30 10:46:49 -07:00
Jean-Baptiste Queru
3d9e1696ed
Merge "Cat: Move Stk imlpementation into Cat folder"
2010-07-30 10:44:00 -07:00
Jean-Baptiste Queru
d8d03c890b
Merge "Ccat: Initial CCAT implementation"
2010-07-30 10:42:15 -07:00
Jean-Baptiste Queru
44a1e3a574
am 969907f3: am f0fa8416: Merge "Make hasIccCard return true if RUIM card is present."
...
Merge commit '969907f3f59cf9420c3bd9d672b509196cf82cbe'
* commit '969907f3f59cf9420c3bd9d672b509196cf82cbe':
Make hasIccCard return true if RUIM card is present.
2010-07-29 14:56:49 -07:00
Jean-Baptiste Queru
969907f3f5
am f0fa8416: Merge "Make hasIccCard return true if RUIM card is present."
...
Merge commit 'f0fa8416e13b2885b858b6974b101c70833e4729' into gingerbread-plus-aosp
* commit 'f0fa8416e13b2885b858b6974b101c70833e4729':
Make hasIccCard return true if RUIM card is present.
2010-07-29 14:53:42 -07:00
Jean-Baptiste Queru
f0fa8416e1
Merge "Make hasIccCard return true if RUIM card is present."
2010-07-29 14:37:48 -07:00
Dmitri Plotnikov
aae052324f
Merge "Throws IllegalArgumentException if the country code is null."
2010-07-28 20:37:26 -07:00
Bai Tao
1e80299bd4
Throws IllegalArgumentException if the country code is null.
...
Also removed unnecessary Locale check
Change-Id: I547713372900f1ea71e2215c0023a0981b6aca94
2010-07-28 20:33:28 -07:00
Bai Tao
fae6ec9e96
Added country based formatNumber methods
...
a. Format the number to E164.
b. Format the number based on country convention.
c. Normailize the number.
Change-Id: I39d59b99aa1a5136371dd20c74d9d9c8ec855369
2010-07-29 06:54:25 +08:00
Wink Saville
fed1722ec8
Merge "Initial MockRilUnitTest."
2010-07-26 17:09:59 -07:00
Wink Saville
50dd565568
Initial MockRilUnitTest.
...
Change-Id: I87d992b789f6fc28777f609b93497eed3053f560
2010-07-26 17:01:10 -07:00
John Wang
cd35cb98a5
Add register methods in CallManager.
...
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: I74ce4e6d8e66f49c12b43bae1b0def0c7597a449
2010-07-26 13:49:48 -07:00
Jean-Baptiste Queru
0d027fc365
am 1b05a79f: am 7cdd26ce: Merge "Enables writing to USIM phonebook (fixes issue 8976)."
...
Merge commit '1b05a79f7d3c77ac2135d8f1ab40f0b13854ffae'
* commit '1b05a79f7d3c77ac2135d8f1ab40f0b13854ffae':
Enables writing to USIM phonebook (fixes issue 8976).
2010-07-23 17:52:30 -07:00
Jean-Baptiste Queru
1b05a79f7d
am 7cdd26ce: Merge "Enables writing to USIM phonebook (fixes issue 8976)."
...
Merge commit '7cdd26ce30e61a108e4def932b96aca9f031e5d2' into gingerbread-plus-aosp
* commit '7cdd26ce30e61a108e4def932b96aca9f031e5d2':
Enables writing to USIM phonebook (fixes issue 8976).
2010-07-23 17:48:11 -07:00
Jean-Baptiste Queru
7cdd26ce30
Merge "Enables writing to USIM phonebook (fixes issue 8976)."
2010-07-23 17:35:13 -07:00
Jean-Baptiste Queru
66a1714504
am 1cb7b2e9: am e7486695: Merge "Add missing logging for SET_TTY_MODE and QUERY_TTY_MODE"
...
Merge commit '1cb7b2e961fdbdfc39013846e97a918be2a14e07'
* commit '1cb7b2e961fdbdfc39013846e97a918be2a14e07':
Add missing logging for SET_TTY_MODE and QUERY_TTY_MODE
2010-07-22 12:47:04 -07:00
Jean-Baptiste Queru
1cb7b2e961
am e7486695: Merge "Add missing logging for SET_TTY_MODE and QUERY_TTY_MODE"
...
Merge commit 'e7486695ced2dd135f6e2223b582adde4155b917' into gingerbread-plus-aosp
* commit 'e7486695ced2dd135f6e2223b582adde4155b917':
Add missing logging for SET_TTY_MODE and QUERY_TTY_MODE
2010-07-22 12:43:07 -07:00
Jean-Baptiste Queru
e7486695ce
Merge "Add missing logging for SET_TTY_MODE and QUERY_TTY_MODE"
2010-07-22 12:22:56 -07:00