Commit Graph

2937 Commits

Author SHA1 Message Date
Pooja Jain
cfa16ec443 Merge "IMS: Add support in frameworks for call deflection feature" am: ba0f9d2973 am: f39bef4801
am: ac48eed9c0

Change-Id: I4695aca7d886f37341672ea5815770e3ccdf7a51
2018-02-08 02:15:56 +00:00
Pooja Jain
d34698def5 IMS: Add support in frameworks for call deflection feature
Call deflection feature is useful to deflect MT call to another
number.

Test: Manual

Bug: 62170348
Change-Id: Idfbcc175a856aa0bb9476f8c73d7a614a3af0700
2018-02-07 12:29:16 +05:30
Brad Ebinger
de65acb915 Merge changes from topic "ims_apis"
* changes:
  Modify ImsService API to accomodate compat
  Make ImsService API @SystemApi
  Integrate new MMTel APIs into the framework
  Integrate ImsCallSessionListener API changes
2018-02-05 19:09:25 +00:00
Jack Yu
0c5f8dfaca resolve merge conflicts of c3415d2bc6 to master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I072c3d46b81dee0a83036ea7d5e91bd1989fa250
2018-02-03 20:42:01 -08:00
Jack Yu
2e9bdd78f2 Merge "Added data service configuration support" 2018-02-03 04:40:46 +00:00
Brad Ebinger
0e370b4a02 Make ImsService API @SystemApi
Marks the ImsService API as @SystemAPI.

Bug: 63987047
Test: Build, Telephony unit tests
Merged-In: I10f8a09950be87cb166b718d1dcc2954fba872cb
Change-Id: I10f8a09950be87cb166b718d1dcc2954fba872cb
2018-02-01 15:45:29 -08:00
Brad Ebinger
5b1883b5f1 Integrate new MMTel APIs into the framework
Performs the bulk of the work of:
1) Moving the old MMTel APIs to a hidden
.compat namespace to support older vendor
versions of the code.

2) Replace the compat MMTel APIs with the
new ImsService APIs and integrate them
into existing code.

This is one of two CLs, this CL
integrates the new APIs, the next CL
creates the compat layer in telephony
to translate the .compat APIs to the new
APIs to allow Telephony to work with
older versions of the API.

Before commit, the corresponding vendor
changes will have to be submitted as well.

Bug: 63987047
Test: Telephony Unit tests
Merged-In: Icc9ecfdad000f42399beeac142083e62962c12d3
Change-Id: Icc9ecfdad000f42399beeac142083e62962c12d3
2018-02-01 15:45:29 -08:00
Brad Ebinger
6ed4ee6847 Integrate ImsCallSessionListener API changes
Integrates the ImsCallSessionListener API changes.
This involves:

1) Moving the ImsCallSessionListener to the
android.telephony.ims namespace.
2) Creating a compat layer between the old
IImsCallSessionListener AIDL and the new one
for vendors using the old implementation.
3) Modify ImsCallSession to only use
setListener to set ImsCallSessionListener
(other method was never used in our code).

Test: Telephony Unit Tests, Manual IMS Tests
Bug: 63987047
Merged-In: I4378c0b1d68ff4f5f21815c81af52c03a66f81c5
Change-Id: Id0cc43e9c97abb6f2776d8ad1cf599353b71e4b7
2018-02-01 15:45:28 -08:00
Jack Yu
fcbda45498 Added data service configuration support
Added the resource overlay and carrier config support for
data service binding package configuration.

Test: Telephony sanity tests
Bug: 64132030
Change-Id: I3d64e6c0a5f86b6a4953eb611ee6828153a8b12d
2018-02-01 14:50:53 -08:00
Treehugger Robot
a02d09a449 Merge "Added support for the new 1.2 data setup/deactivate API" 2018-02-01 20:10:36 +00:00
Jack Yu
677cfaa2a0 Added support for the new 1.2 data setup/deactivate API
Added support for the 1.2 IRadio APIs that support IWLAN handover.

Test: Telephony sanity tests
Bug: 64132030
Merged-In: I8c962bb45bc4d42610faa32f0ee36080e8e6cb65
Change-Id: I8c962bb45bc4d42610faa32f0ee36080e8e6cb65
(cherry picked from commit 08063d6c1b)
2018-02-01 03:26:10 -08:00
Jack Yu
4aa09f4c7f Merge "Added support for the new 1.2 data setup/deactivate API" 2018-02-01 11:21:00 +00:00
Mohamed Abdalkader
304f4b5509 Add and trigger onReady API for SMS over IMS.
Test: manual test that normal code path is fine since this code path is
not yet exercisable.
BUG=69846044
Merged-In: Icb15ca4aa6606fba641f6270dca5e0e06fc4466a
Change-Id: Icb15ca4aa6606fba641f6270dca5e0e06fc4466a
2018-01-31 14:55:42 -08:00
Mohamed Abdalkader
6e545d5892 Move Sms API to proper MMTelFeature class
- while here remove unnecessary call to ackSms from
  SmsImplBase as this is handled by ImsSmsDispatcher

Test: None, APIs not exercised yet.
BUG=69846044
Merged-In: Iec4bbd07a67502dbbfb2142a7bc95f51be0cb377
Change-Id: Iec4bbd07a67502dbbfb2142a7bc95f51be0cb377
2018-01-31 11:24:31 -08:00
Jack Yu
08063d6c1b Added support for the new 1.2 data setup/deactivate API
Added support for the 1.2 IRadio APIs that support IWLAN handover.

Test: Telephony sanity tests
Bug: 64132030
Change-Id: I8c962bb45bc4d42610faa32f0ee36080e8e6cb65
2018-01-31 10:16:57 -08:00
nharold
d21e8d8b7b Merge "Remove getIsimChallengeResponse" am: b6d5a85a9c am: c13ddc2fe0
am: e69ef2e511

Change-Id: I4117e88b3c6360d9b6c542f53826bef612572700
2018-01-31 02:18:53 +00:00
Holly Jiuyu Sun
bba3be6a5e Merge "Only allow LPA to select ISD-R using iccTransmitApduBasicChannel" am: 04e5e63305 am: 8b37eedfc9
am: 7c824e97b9

Change-Id: I33e427e9f34c90a742dd9c6e7cc2baf0bfad4825
2018-01-31 00:27:00 +00:00
nharold
b6d5a85a9c Merge "Remove getIsimChallengeResponse" 2018-01-31 00:23:50 +00:00
Holly Jiuyu Sun
04e5e63305 Merge "Only allow LPA to select ISD-R using iccTransmitApduBasicChannel" 2018-01-30 23:05:00 +00:00
Nathan Harold
0c9937cb5c Remove getIsimChallengeResponse
Remove the obsolete getIsimChallengeResponse.
Anybody calling this method should use
getIccSimChallengeResponse instead.

Bug: 27954896
Test: compilation
Change-Id: I636825a448992e06dc11d4cd58dee750c38b2c5e
2018-01-29 13:30:58 -08:00
Nathan Harold
1e2fdde533 Add Constants for NATT Keepalive to RILConstants
Bug: 38350389
Test: compilation
Merged-In: Ic18a7c947d2c62efe76d656bd683f9ce296f68fd
Change-Id: Ic18a7c947d2c62efe76d656bd683f9ce296f68fd
(cherry picked from commit 974aada047)
2018-01-29 11:20:12 -08:00
Holly Jiuyu Sun
4f880138e4 Only allow LPA to select ISD-R using iccTransmitApduBasicChannel
Bug: 72561613
Test: test on phone
Change-Id: Ifae8c341dd41936a993c6202bc0c7d1c71b8d360
2018-01-26 17:16:14 -08:00
Brad Ebinger
f8c3cd8b35 Make ImsService API @SystemApi
Marks the ImsService API as @SystemAPI.

Bug: 63987047
Test: Build, Telephony unit tests
Change-Id: I10f8a09950be87cb166b718d1dcc2954fba872cb
2018-01-25 14:11:37 -08:00
Brad Ebinger
112c36d39f Integrate new MMTel APIs into the framework
Performs the bulk of the work of:
1) Moving the old MMTel APIs to a hidden
.compat namespace to support older vendor
versions of the code.

2) Replace the compat MMTel APIs with the
new ImsService APIs and integrate them
into existing code.

This is one of two CLs, this CL
integrates the new APIs, the next CL
creates the compat layer in telephony
to translate the .compat APIs to the new
APIs to allow Telephony to work with
older versions of the API.

Before commit, the corresponding vendor
changes will have to be submitted as well.

Bug: 63987047
Test: Telephony Unit tests
Change-Id: Icc9ecfdad000f42399beeac142083e62962c12d3
2018-01-25 10:51:27 -08:00
Brad Ebinger
264625486b Integrate ImsCallSessionListener API changes
Integrates the ImsCallSessionListener API changes.
This involves:

1) Moving the ImsCallSessionListener to the
android.telephony.ims namespace.
2) Creating a compat layer between the old
IImsCallSessionListener AIDL and the new one
for vendors using the old implementation.
3) Modify ImsCallSession to only use
setListener to set ImsCallSessionListener
(other method was never used in our code).

Test: Telephony Unit Tests, Manual IMS Tests
Bug: 63987047

Change-Id: I4378c0b1d68ff4f5f21815c81af52c03a66f81c5
2018-01-25 10:50:43 -08:00
TreeHugger Robot
9543d6eb65 Merge changes from topic "sms_ready"
* changes:
  Unhide SMS over IMS APIs
  Add and trigger onReady API for SMS over IMS.
2018-01-25 12:11:34 +00:00
Jun Yin
c949502b95 Merge "Adds stripTrailingFs" am: 27bb333e14 am: a91491a3b8
am: 76e05493b4

Change-Id: Ie4c5994131a97b9acbe445abef3f4c6e73009732
2018-01-25 03:42:45 +00:00
Treehugger Robot
27bb333e14 Merge "Adds stripTrailingFs" 2018-01-25 02:44:26 +00:00
Nathan Harold
1e39ade047 Merge changes from topic "keepalive-on-cell"
* changes:
  Rework KeepalivePacketData for Compatibility with Cell
  Add Constants for NATT Keepalive to RILConstants
  Relocate KeepalivePacketData to frameworks/base
2018-01-25 00:48:43 +00:00
Holly Jiuyu Sun
047707c7aa Merge "Revert "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager.""" am: ec44a402d2 am: 596c22a84d
am: 07b212b788

Change-Id: I771845c9f07aa18946c0ab99fffd2a08d888e819
2018-01-24 23:37:16 +00:00
Mohamed Abdalkader
bddbd624ec Add and trigger onReady API for SMS over IMS.
Test: manual test that normal code path is fine since this code path is
not yet exercisable.
BUG=69846044
Change-Id: Icb15ca4aa6606fba641f6270dca5e0e06fc4466a
2018-01-24 15:07:24 -08:00
Tyler Gunn
c3f129c795 Merge "Add new IMS reasoninfo to handle alternate emergency disconnect scenario." am: 7a481bde6d am: f343e33dd5
am: e39de15109

Change-Id: I48b1c82a051342b6a4504290a6297aebc8a2bdfd
2018-01-24 22:38:52 +00:00
Holly Jiuyu Sun
ec44a402d2 Merge "Revert "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager.""" 2018-01-24 21:11:07 +00:00
Jun Yin
b40a26c43d Adds stripTrailingFs
This function removes padding 'F' characters in a string (e.g., ICCID).

Bug: 38206971
Test: unit test in another cl
Change-Id: If77604576c5bd26404cdc436f8297191664325a4
2018-01-24 12:33:05 -08:00
Treehugger Robot
7a481bde6d Merge "Add new IMS reasoninfo to handle alternate emergency disconnect scenario." 2018-01-24 19:33:33 +00:00
Nathan Harold
974aada047 Add Constants for NATT Keepalive to RILConstants
Bug: 38350389
Test: compilation
Change-Id: Ic18a7c947d2c62efe76d656bd683f9ce296f68fd
2018-01-24 10:26:04 -08:00
Holly Jiuyu Sun
0ee6dfee1a Revert "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager.""
This reverts commit 5c9dcc0e72.

Reason for revert: The original failure was not caused by this CL and this CL does not depend on the broken one.

Change-Id: Ia60e21f634d8f307f1cf5a3992cb38de04c5f443
2018-01-24 17:57:39 +00:00
Nicolas Geoffray
1f568c14ac Merge "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager."" 2018-01-24 10:44:10 +00:00
Neil Fuller
4cfc02a316 Revert "Add getUiccSlots() and switchSlots() in TelephonyManager."
AOSP build broken.

Bug: 71914112

This reverts commit 2f87d7b2ee.
2018-01-24 10:07:48 +00:00
Holly Jiuyu Sun
d201c4dd51 Merge "Add getUiccSlots() and switchSlots() in TelephonyManager." am: 8fd5b7e1c3 am: 5598f5ab23
am: 687a28d77d

Change-Id: I56abcc7731ca08ed67a5123f826bfbc9ca4f74d0
2018-01-24 09:42:42 +00:00
Nicolas Geoffray
5c9dcc0e72 Revert "Add getUiccSlots() and switchSlots() in TelephonyManager."
AOSP build broken.

Bug: 71914112

This reverts commit 2f87d7b2ee.

Change-Id: I53537a6da7616fe6dbbb79927b32720bbeaf1f69
2018-01-24 09:11:40 +00:00
Holly Jiuyu Sun
48c6e980f5 Merge "Add cardId in EuiccCardManager API." am: a85291bfcf am: 50b8d3ef75
am: 9d5d23b69a

Change-Id: Ie922ef52b4fb5b6ee95bb5976b16d5f54d9b43a1
2018-01-24 05:39:57 +00:00
Holly Jiuyu Sun
8fd5b7e1c3 Merge "Add getUiccSlots() and switchSlots() in TelephonyManager." 2018-01-24 05:08:19 +00:00
Holly Jiuyu Sun
c2779f56fb Add cardId in EuiccCardManager API.
Removed getEid() API.

Bug: 38206971
Test: test on phone
Change-Id: I7e484f889a780900acd3a05a96fbbc632e1ec682
2018-01-23 17:11:30 -08:00
Holly Jiuyu Sun
2f87d7b2ee Add getUiccSlots() and switchSlots() in TelephonyManager.
Bug: 71914112
Test: test on phone
Change-Id: Ib7e9e40e5ecda48bdcd1f332dc7d6c422c08d942
2018-01-23 15:26:34 -08:00
Treehugger Robot
0fc9900802 Merge "Added new SIM state related broadcasts." 2018-01-19 04:25:12 +00:00
TreeHugger Robot
1ebcf6101d Merge "Added new SIM state related broadcasts." 2018-01-19 02:32:46 +00:00
Mohamed Abdalkader
c5cc226f9e Merge "Move Sms API to proper MMTelFeature class" 2018-01-18 22:51:27 +00:00
Amit Mahajan
5d70fc9ae3 Added new SIM state related broadcasts.
Test: Basic telephony sanity and unit tests
Bug: 64131518
Merged-in: Ie3d157e79a7040c161b9038c875a4a4f49d535ff
Change-Id: Ie3d157e79a7040c161b9038c875a4a4f49d535ff
2018-01-18 14:44:07 -08:00
Amit Mahajan
052e1e2941 Added new SIM state related broadcasts.
Test: Basic telephony sanity and unit tests
Bug: 64131518
Change-Id: Ie3d157e79a7040c161b9038c875a4a4f49d535ff
2018-01-18 14:38:21 -08:00