Commit Graph

2967 Commits

Author SHA1 Message Date
Pengquan Meng
847734cc67 Merge changes from topic "am-59911b1f-fa0c-400c-a3f8-812ac0a8762b" into oc-dev am: fe6a5c4675 am: 5eb85f01d2
am: 037206683b

Change-Id: If981740986af74936a82d496eab591d8009e3613
2018-03-10 01:14:11 +00:00
Pengquan Meng
037206683b Merge changes from topic "am-59911b1f-fa0c-400c-a3f8-812ac0a8762b" into oc-dev am: fe6a5c4675
am: 5eb85f01d2

Change-Id: Iaf8ea26f3739a5c62ce6bb402ae8161ef99b5f80
2018-03-10 00:44:41 +00:00
Pengquan Meng
5eb85f01d2 Merge changes from topic "am-59911b1f-fa0c-400c-a3f8-812ac0a8762b" into oc-dev
am: fe6a5c4675

Change-Id: I4440e9b50e975ea3a20ecd216b83deb83afe2780
2018-03-10 00:20:21 +00:00
Android Build Merger (Role)
90000baf89 [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734 am: 3b356d5111 am: a61fe8f6c0 am: 3276de21ea am: bd60a681bf am: 5d5e5ca7cb am: f64ab1e93d
Change-Id: I8fc1082b7c6c64cf105246fe374260f72e83a7a8
2018-03-09 04:19:32 +00:00
Android Build Merger (Role)
f64ab1e93d [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734 am: 3b356d5111 am: a61fe8f6c0 am: 3276de21ea am: bd60a681bf am: 5d5e5ca7cb
Change-Id: I3bd9d6f3d290ae125d57a4650b41b8ff6cbb5591
2018-03-09 04:19:26 +00:00
Android Build Merger (Role)
bd60a681bf [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734 am: 3b356d5111 am: a61fe8f6c0 am: 3276de21ea
Change-Id: Ic702e9da64dc5aa8e66db22d72f070140c40bdf6
2018-03-09 04:19:16 +00:00
Android Build Merger (Role)
3276de21ea [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734 am: 3b356d5111 am: a61fe8f6c0
Change-Id: I9206a21355732e408430ceae77d3095793a04072
2018-03-09 04:19:11 +00:00
Android Build Merger (Role)
a61fe8f6c0 [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734 am: 3b356d5111
Change-Id: I96567f3adabce5207b07f71ac3b8fe60944a83f2
2018-03-09 04:19:00 +00:00
Android Build Merger (Role)
3b356d5111 [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734
Change-Id: I03d75f7b837fdeafabcf64a8d56e1b1f7af89050
2018-03-09 04:18:55 +00:00
Android Build Merger (Role)
61f84448eb [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728
Change-Id: Ic9cf5392057bfb47945e9a1b06abb19697468610
2018-03-09 04:18:45 +00:00
Pengquan Meng
8c55a70728 Fixed Security Vulnerability of DcParamObject
The writeToParcel and readFromParcel is not symmetry, fixed it.

Test: no test
Bug: 70721937
Change-Id: I01f6f6b2ab778ee8b638d9b69fe0a6b9aa7ee395
2018-03-09 04:18:36 +00:00
Eric Schwarzenbach
180842398f Merge "Plumb PhysicalChannelConfig all the way up." am: 44d13875ff am: c870528371
am: 7771e91a99

Change-Id: Ia0a69386981e2984472e9153c161cca7bfccc9dd
2018-03-01 05:57:20 +00:00
Treehugger Robot
44d13875ff Merge "Plumb PhysicalChannelConfig all the way up." 2018-03-01 03:48:32 +00:00
Brad Ebinger
e9113e9046 Merge "Modify shouldProcessCall API to remove redundancy" am: 59391aa4a0 am: 8f2c2ca09a
am: 27617a9894

Change-Id: Id4638c9126cce687bb4513731be2aeb962b2250d
2018-02-28 04:59:52 +00:00
TreeHugger Robot
6e0f8e2620 Merge "Added indication update mode support" 2018-02-28 04:01:41 +00:00
Treehugger Robot
59391aa4a0 Merge "Modify shouldProcessCall API to remove redundancy" 2018-02-28 03:02:27 +00:00
Jack Yu
1a1c35750b Added indication update mode support
Adde the indication update mode support so that a system
component can control the behavior of indication update. This
will be used by the bluetooth stack when some BT devices such like
carkit is connected, modem will continue update the signal strength
even when the screen is off.

Test: Manual
Bug: 65112388
Change-Id: I4bb4894eaaba401f655e5dc25138275f5e8498e1
2018-02-27 17:40:31 -08:00
Jayachandran Chinnakkannu
85ef115e72 Merge "Add support for sending message with priority, link control and validity period options" am: b103f9309b am: bb29858d7f
am: 0000a9b623

Change-Id: I5da271b0f113844b7ad393a051078af602fa518d
2018-02-27 00:53:32 +00:00
Mengjun Leng
b379ce981b Add support for sending message with priority, link control and validity period options
1. Added support for message priority(indicates the priority of a
   SMS to the network in the PDU) in 3gpp2
2. Added support for link control(indicates whether network can
   expect more messages or not so it can decide whether to retain
   the radio link or not) while sending multiple messages
3. Added support for validity period(indicates how much time the
   SMS is valid at the SMSC) support in 3gpp
4. Amended UT test cases for API changes and add UT validity period
   test case

Test: Verfied sending short SMS, long SMS, MMS, SMS with emoji on
      live network

Bug: 34962629
2018-02-24 01:14:03 +00:00
Jeff Davidson
3c94405a6a Merge "Factor out telephony permission checks into a helper class." 2018-02-22 16:48:53 +00:00
Jeff Davidson
d7bf38ad00 Factor out telephony permission checks into a helper class.
The aim is to cut down on duplicate code (for a particularly high-risk
area) and make it easier to expand READ_PHONE_STATE access to
carrier-privileged apps in a follow-up CL.

No major functional changes are intended, although some logging will
change slightly (different tag / less verbose carrier privilege
logging without DBG flag).

Bug: 70041899
Test: bit FrameworksTelephonyTests:*, nothing visibly broken on boot
Merged-In: I3b2aa9b8d6177a25d532060009508ef31baea69c
Change-Id: I3b2aa9b8d6177a25d532060009508ef31baea69c
2018-02-21 17:30:41 -08:00
Jeff Davidson
d4ddd4caee Factor out telephony permission checks into a helper class.
The aim is to cut down on duplicate code (for a particularly high-risk
area) and make it easier to expand READ_PHONE_STATE access to
carrier-privileged apps in a follow-up CL.

No major functional changes are intended, although some logging will
change slightly (different tag / less verbose carrier privilege
logging without DBG flag).

Bug: 70041899
Test: bit FrameworksTelephonyTests:*, nothing visibly broken on boot
Change-Id: I3b2aa9b8d6177a25d532060009508ef31baea69c
2018-02-21 23:48:37 +00:00
Brad Ebinger
611f996de3 Modify shouldProcessCall API to remove redundancy
No need to differentiate between CSFB for emergency
and non-emergency calls.

Test: Telephony unit tests
Bug: 72642113
Change-Id: Ibc5aed284be030cc584d774f122d6082ff013f5f
2018-02-20 11:07:37 -08:00
Eric Schwarzenbach
4ce04ddea1 Plumb PhysicalChannelConfig all the way up.
Updates TelephonyRegistry and PhoneStateListener to propagate
unsolicited PhysicalChannelConfig updates.

Bug: 72117533
Test: runtest frameworks-telephony

Change-Id: Ia6a6c4c76f95bd57bbd10c33abe9d10752f98caa
2018-02-16 10:28:37 -08:00
Brad Ebinger
64afdd9376 MSIM support for hidden IMS capability and registration query APIs.
Modifies TelephonyManager APIs to better support MSIM devices
and adds a method to query MMTEL IMS Registration technology.

Test: Manual, telephony unit tests.
Bug: 35128252
Merged-In: Ie37185bd3477635094a0db998918ba5ad59842be
Change-Id: Ie37185bd3477635094a0db998918ba5ad59842be
2018-02-14 18:36:17 +00:00
Brad Ebinger
76e48f8a60 MSIM support for hidden IMS capability and registration query APIs.
Modifies TelephonyManager APIs to better support MSIM devices
and adds a method to query MMTEL IMS Registration technology.

Test: Manual, telephony unit tests.
Bug: 35128252
Change-Id: Ie37185bd3477635094a0db998918ba5ad59842be
2018-02-14 10:10:42 -08:00
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