Jonathan Basseri
9a19e8948d
resolve merge conflicts of 4c04097 to nyc-mr1-dev
...
am: 04c35e78db
* commit '04c35e78dbd5bc6670b5bf4e72686f696745af13':
Change how TelephonyManager handles subscriptions.
Change-Id: Ie26627bb443603f1e5f017a8df243922d2955f3d
2016-05-26 23:13:17 +00:00
Jonathan Basseri
04c35e78db
resolve merge conflicts of 4c04097 to nyc-mr1-dev
...
Change-Id: I256514588af20985108f72a5e204811904f87c9c
2016-05-26 11:41:17 -07:00
Jonathan Basseri
4c04097fdb
Merge "Change how TelephonyManager handles subscriptions." into nyc-dev
2016-05-26 15:50:05 +00:00
Jonathan Basseri
8a6561d177
Change how TelephonyManager handles subscriptions.
...
Addressing API council feedback, remove* all subscription ID arguments
from API calls, and provide a factory method to create a new
TelephonyManager which uses a given subId.
* The subId methods will be @hidden instead of deleted.
Bug: 28845064
Change-Id: I2de8ae9e45bc14962c7c20d7d076ec83bce92cd3
2016-05-25 18:49:11 -07:00
Derek Tan
9b8b72748c
Merge "Per API review, revert the API renaming CL." into nyc-dev am: 03d3f4a6cb
...
am: 869f32d810
* commit '869f32d8101862b8c96ecb6cd7317acf0c655c38':
Per API review, revert the API renaming CL.
Change-Id: I8017702c808b84c8f05dd51ba8c8c0afda8a6b9f
2016-05-26 00:00:49 +00:00
Derek Tan
869f32d810
Merge "Per API review, revert the API renaming CL." into nyc-dev
...
am: 03d3f4a6cb
* commit '03d3f4a6cb2c2d7b92e5cff09e5e7daefba398e9':
Per API review, revert the API renaming CL.
Change-Id: Ic5fb3154e837742622e27fbc2d68eb19930a2faf
2016-05-25 23:50:45 +00:00
Derek Tan
e214ff00ea
Merge "Per API review, revert the API renaming CL." into nyc-dev
...
am: 03d3f4a6cb
* commit '03d3f4a6cb2c2d7b92e5cff09e5e7daefba398e9':
Per API review, revert the API renaming CL.
Change-Id: I536acb34c3d4b531db777a0635ccdb173db1183d
2016-05-25 23:50:12 +00:00
Derek Tan
03d3f4a6cb
Merge "Per API review, revert the API renaming CL." into nyc-dev
2016-05-25 23:41:21 +00:00
Junda Liu
ec319efbd5
Merge "Add restricted card state to telephony manager." into nyc-mr1-dev
...
am: ea97857a78
* commit 'ea97857a7868467a5cbe986807d04854cc4c3442':
Add restricted card state to telephony manager.
Change-Id: I800619a54e75424d6dbb723216ae250ec6276e41
2016-05-25 21:50:29 +00:00
Junda Liu
ea97857a78
Merge "Add restricted card state to telephony manager." into nyc-mr1-dev
2016-05-25 21:39:12 +00:00
Derek Tan
818822ad5d
Per API review, revert the API renaming CL.
...
Revert "Multi-SIM - Fixing inconsistent naming in CarrierConfigManager."
This reverts commit 3bf26b5605 .
Bug: 28295813
Change-Id: I44e7925c86c68a79b8d962670baadea7a7227ca2
2016-05-25 18:37:05 +00:00
Ta-wei Yen
4567add419
Merge "Switch VVM SMS filter to Builder pattern" into nyc-mr1-dev
...
am: 85663d7edf
* commit '85663d7edfddd275e6e433bfe2c8b99bab019a49':
Switch VVM SMS filter to Builder pattern
Change-Id: I85aaa4fc34a7f0b240f05bba98104879438c6331
2016-05-25 00:18:58 +00:00
Ta-wei Yen
85663d7edf
Merge "Switch VVM SMS filter to Builder pattern" into nyc-mr1-dev
2016-05-25 00:13:06 +00:00
Junda Liu
a2f6a67511
Add restricted card state to telephony manager.
...
Bug: b/28564314
Change-Id: If19b12036b09a8cd015dce4faf5de26606ee2b97
2016-05-24 16:03:37 -07:00
Ta-wei Yen
67ab168b78
Switch VVM SMS filter to Builder pattern
...
Bug:27816386
Change-Id: I74c73f0a43530dc563df29f0df7ae1a40845e8f0
2016-05-24 15:25:16 -07:00
Meng Wang
fe9ed66227
Merge "Add API setAllowedCarriers, getAllowedCarriers to TelephonyManager" into nyc-mr1-dev
...
am: ac517216c5
* commit 'ac517216c50075baf3f93ae06ebec3dcb68ad9a9':
Add API setAllowedCarriers, getAllowedCarriers to TelephonyManager
Change-Id: Ice91655cf111964ec20f961b2555da3cc4b9325c
2016-05-20 22:21:26 +00:00
Meng Wang
64997623bf
Add API setAllowedCarriers, getAllowedCarriers to TelephonyManager
...
Also:
Add RIL constants RIL_REQUEST_SET_ALLOWED_CARRIERS, RIL_REQUEST_GET_ALLOWED_CARRIERS
Bug: 28564314
Change-Id: Iaf6c40de633e767309c4088249a5c13cb0988c5c
2016-05-20 13:18:41 -07:00
Sanket Padawe
c4a4de836e
Merge "Add new TelephonyManager api to query Telephony metrics." into nyc-mr1-dev
...
am: 096e99e25c
* commit '096e99e25ce30dbd7a86d6cd543e27a087fbb243':
Add new TelephonyManager api to query Telephony metrics.
Change-Id: I5ba87e5c4e8c1b901f6ec98c94fed283aab24a36
2016-05-20 16:52:40 +00:00
Sanket Padawe
096e99e25c
Merge "Add new TelephonyManager api to query Telephony metrics." into nyc-mr1-dev
2016-05-20 16:47:05 +00:00
Ta-wei Yen
f652b1ec42
Merge "Rename visual voicemail sync intent value" into nyc-dev am: 0f712b164f
...
am: 621b68a213
* commit '621b68a2136b644734292655228503c42a541576':
Rename visual voicemail sync intent value
Change-Id: Ia517f7c596e8d1d1dc055ea081950328faf4f34f
2016-05-20 01:11:34 +00:00
Ta-wei Yen
7220c75f65
Merge "Rename visual voicemail sync intent value" into nyc-dev
...
am: 0f712b164f
* commit '0f712b164fa24efdf5c5c2b20d939c3e7affbfe3':
Rename visual voicemail sync intent value
Change-Id: I677dcd6e8261dfdbf4ab203ef1232f9f599a0687
2016-05-20 01:06:04 +00:00
Ta-wei Yen
621b68a213
Merge "Rename visual voicemail sync intent value" into nyc-dev
...
am: 0f712b164f
* commit '0f712b164fa24efdf5c5c2b20d939c3e7affbfe3':
Rename visual voicemail sync intent value
Change-Id: I3c842deef20bcc0258affa2ca7d2241502ec49f6
2016-05-20 01:06:03 +00:00
Sanket Padawe
06e1ae1a51
Add new TelephonyManager api to query Telephony metrics.
...
Bug: 28717269
Change-Id: I6f5e88509feda879162049955776cb61dda8c840
2016-05-18 16:51:49 -07:00
Tyler Gunn
7a63216d83
Merge "Continued multi-endpoint work." into nyc-mr1-dev
...
am: beb8c4954d
* commit 'beb8c4954db199412a8e59b45198b0c2ac449bfd':
Continued multi-endpoint work.
Change-Id: I1090df296dd4f0824202f5173e88ba8d6570db5f
2016-05-18 20:32:33 +00:00
Tyler Gunn
beb8c4954d
Merge "Continued multi-endpoint work." into nyc-mr1-dev
2016-05-18 20:22:07 +00:00
Ta-wei Yen
153fcd7ba1
Rename visual voicemail sync intent value
...
Rename value of KEY_VVM_CELLULAR_DATA_REQUIRED_BOOL KEY_VVM_PREFETCH_BOOL
Change-Id: I13718333a8ddc38e8d2131b478562b76cf9aab64
Fixes:28819765
Fixes:28822093
2016-05-17 15:57:20 -07:00
Vineeta Srivastava
14fd0ca669
Merge "wifi calling emergency address carrier config" into nyc-mr1-dev
...
am: db41be8ef4
* commit 'db41be8ef4c1c3364eaf3b552f0037f80cd0fe0f':
wifi calling emergency address carrier config
Change-Id: I5d1ff70da4e92637e77d144eba70009a12ced185
2016-05-17 20:26:41 +00:00
Vineeta Srivastava
db41be8ef4
Merge "wifi calling emergency address carrier config" into nyc-mr1-dev
2016-05-17 20:18:03 +00:00
Ta-wei Yen
655041ef5a
Merge "Add visual voicemail SMS filter APIs" into nyc-mr1-dev
...
am: ca2da6dc33
* commit 'ca2da6dc3332bb657e4927b837e5bc15a6e119cb':
Add visual voicemail SMS filter APIs
Change-Id: I8b124c6a22e473f760e29be8d79843ec55122bb7
2016-05-16 20:43:01 +00:00
Vineeta Srivastava
c7d7ab7fab
wifi calling emergency address carrier config
...
Add a carrier config for providing emergency address to carriers for
WiFi Calling use case.
Bug: 28404126
Change-Id: I33ed973d5ce6c9503412d5d97aa7278aaae888b5
2016-05-16 10:49:01 -07:00
Ta-wei Yen
349f4eddf7
Add visual voicemail SMS filter APIs
...
Added the following APIs to the framework:
VoicemailContracts.ACTION_VOICEMAIL_SMS_RECEIVED
VoicemailContracts.EXTRA_VOICEMAIL_SMS_TYPE
VoicemailContracts.EXTRA_VOICEMAIL_SMS_DATA
VoicemailContracts.EXTRA_VOICEMAIL_SMS_SUBID
TelphonyManager.setVisualVoicemailSmsFilterEnabled()
TelphonyManager.isVisualVoicemailSmsFilterEnabled()
TelphonyManager.setVisualVoicemailSmsFilterPrefix()
TelphonyManager.getVisualVoicemailSmsFilterPrefix()
TelphonyManager.setVisualVoicemailSmsFilterOriginatingNumbers()
TelphonyManager.getVisualVoicemailSmsFilterOriginatingNumbers()
TelphonyManager.setVisualVoicemailSmsFilterDestinationPort()
TelphonyManager.getVisualVoicemailSmsFilterDestinationPort()
TelphonyManager.VVM_SMS_FILTER_DESTINATION_PORT_ANY
TelphonyManager.VVM_SMS_FILTER_DESTINATION_PORT_DATA_SMS
These values are required to implement the VisualVoicemailSmsFilter in
frameworks/opt/telephony
All of the APIs are hidden.
Bug:27816386
Bug:27817303
Change-Id: I07736785da5fece84d1f3d27f270ac6fa94c1c56
(cherry picked from commit ecbcce11ce )
2016-05-16 17:37:48 +00:00
Chen Xu
9d8566d361
Merge "disable wifi only mode from wfc setting for nyc" into nyc-dev am: 8fde916de8
...
am: ea88c4c2fa
* commit 'ea88c4c2fa5530423e658e51f4df01ef79e4d3cc':
disable wifi only mode from wfc setting for nyc
Change-Id: I85d954b030b0576d0bb3e9fa9d4e256e51ad3570
2016-05-12 23:08:34 +00:00
fionaxu
c3b0c1f304
Merge "disable wifi only mode from wfc setting for nyc" into nyc-dev
...
am: 8fde916de8
* commit '8fde916de89b5f0e777f687f3290976ec124faa5':
disable wifi only mode from wfc setting for nyc
Change-Id: I3083a247a81dcb22042791a7df7c54f3a3484958
2016-05-12 23:05:57 +00:00
fionaxu
ea88c4c2fa
Merge "disable wifi only mode from wfc setting for nyc" into nyc-dev
...
am: 8fde916de8
* commit '8fde916de89b5f0e777f687f3290976ec124faa5':
disable wifi only mode from wfc setting for nyc
Change-Id: Ie74e4e0017ce4d514d5d458e05c2b226164a3bb6
2016-05-12 23:05:55 +00:00
Chen Xu
8fde916de8
Merge "disable wifi only mode from wfc setting for nyc" into nyc-dev
2016-05-12 22:57:40 +00:00
Youhan Wang
58f48aa955
Merge "Add getEsn()." into nyc-mr1-dev
...
am: 16717be173
* commit '16717be1738c29ad4f3dd992121ad4bac8b8d5c1':
Add getEsn().
Change-Id: I43db23cff359f906b7d6a5bbc50b3cf490a7371c
2016-05-12 21:13:43 +00:00
fionaxu
dcf5c2b8e2
disable wifi only mode from wfc setting for nyc
...
Bug: 28691529
Change-Id: I78a5606b213628148218cb5e9db63192a15384d7
2016-05-12 13:40:05 -07:00
Youhan Wang
7717acd174
Add getEsn().
...
Bug:27612001
Change-Id: I0cb61cd8a7604e2cc6959b181672fe63a1673447
2016-05-11 18:49:53 -07:00
Tyler Gunn
825da238c5
Continued multi-endpoint work.
...
1. Adding telephony disconnet cause for use when a call was pulled.
2. Added helped method to phone number utils which can be used to reformat
a telephony number stored as a SIP URI into a tel URI.
Bug: 27458894
Change-Id: Idef25bbc7b80258b361eb913d4c94b8bb34d7a4a
2016-05-10 20:04:27 -07:00
Tyler Gunn
d07c30d68f
Merge "Add new carrier config option for video conference support." into nyc-mr1-dev
...
am: 8b38b22066
* commit '8b38b22066778b1e23583a915451c952f2221632':
Add new carrier config option for video conference support.
Change-Id: Ia8281425aa17033489b0aa2c55669f578bfd73a7
2016-05-11 01:23:26 +00:00
Tyler Gunn
8b38b22066
Merge "Add new carrier config option for video conference support." into nyc-mr1-dev
2016-05-11 01:17:24 +00:00
Youhan Wang
62305f9ff6
Merge "Add getAidForApptype()." into nyc-mr1-dev
...
am: d4ddc7bcc1
* commit 'd4ddc7bcc14fafae55be393a240fbba82011b960':
Add getAidForApptype().
Change-Id: Ifcd2f796884e58e2e5fbea8a12343f32460f91fa
2016-05-09 17:12:16 +00:00
Youhan Wang
d4ddc7bcc1
Merge "Add getAidForApptype()." into nyc-mr1-dev
2016-05-09 17:04:57 +00:00
Nathan Harold
827bd873e0
Merge "Coerce 8-bit bsic to Integer if Invalid" into nyc-dev am: 08acd3ce28
...
am: f7e4c04af3
* commit 'f7e4c04af38020b27647fa424db78ac2bfb14d8e':
Coerce 8-bit bsic to Integer if Invalid
Change-Id: Iabcec0a020b195af49109f9693034c4982e8127a
2016-05-06 03:36:40 +00:00
Nathan Harold
f4e69ad465
Merge "CellInfo Parceling for Invalid Values" into nyc-dev am: 5b45c62a1a
...
am: d18da6fa93
* commit 'd18da6fa939aba229c7ec89ffa6e7ca95317c04c':
CellInfo Parceling for Invalid Values
Change-Id: I80a37f2392bb2d07af074a3b8f7693c28b75e668
2016-05-06 03:36:38 +00:00
Nathan Harold
f7e4c04af3
Merge "Coerce 8-bit bsic to Integer if Invalid" into nyc-dev
...
am: 08acd3ce28
* commit '08acd3ce28ff34f5a49d693b4c1144d967208e67':
Coerce 8-bit bsic to Integer if Invalid
Change-Id: I0fed240d0cd84e76283fb663f826b420922d1dc1
2016-05-06 03:31:35 +00:00
Nathan Harold
d18da6fa93
Merge "CellInfo Parceling for Invalid Values" into nyc-dev
...
am: 5b45c62a1a
* commit '5b45c62a1a13801ed4c5fd228976928b30f63867':
CellInfo Parceling for Invalid Values
Change-Id: I7ecbb84a507197e33771c3c1afb172bd89fbd557
2016-05-06 03:31:31 +00:00
Nathan Harold
43864702b6
Merge "Coerce 8-bit bsic to Integer if Invalid" into nyc-dev
...
am: 08acd3ce28
* commit '08acd3ce28ff34f5a49d693b4c1144d967208e67':
Coerce 8-bit bsic to Integer if Invalid
Change-Id: Ib1cf6ecce437c8198da169fd5a4f0d1301e1547e
2016-05-06 03:31:30 +00:00
Nathan Harold
f0db11324a
Merge "CellInfo Parceling for Invalid Values" into nyc-dev
...
am: 5b45c62a1a
* commit '5b45c62a1a13801ed4c5fd228976928b30f63867':
CellInfo Parceling for Invalid Values
Change-Id: I049eabf4ede20f591fd193e133e62444c1185fb7
2016-05-06 03:31:28 +00:00
Youhan Wang
2da9b2b8bf
Add getAidForApptype().
...
To TelephonyManager and ITelephony.aidl.
Bug:27612001
Change-Id: Icb9dc5e29f3a635b2d807e8abcd15a5e1a85b02d
2016-05-05 16:12:58 -07:00