Commit Graph

3171 Commits

Author SHA1 Message Date
Hall Liu
520b975ded Merge "Revert "Check for location access on TelephonyRegistry"" am: 39393f889a am: 772d17c263
am: 07e1d78346

Change-Id: I9ab304409e6f777593e6c927bb0d76b8f82038fc
2018-02-07 03:16:29 +00:00
Hall Liu
07e1d78346 Merge "Revert "Check for location access on TelephonyRegistry"" am: 39393f889a
am: 772d17c263

Change-Id: I7e2fd26aad4c09bca97142279434fb108abae848
2018-02-06 23:28:17 +00:00
Malcolm Chen
d7672c6f49 Merge "Add strings and carrier config needed network service." am: a3ccb8d854
am: 0c2a5852f5

Change-Id: I51a4792545c4fb06611681ef2f4ca1183f2fd61a
2018-02-06 23:14:06 +00:00
Hall Liu
39393f889a Merge "Revert "Check for location access on TelephonyRegistry"" 2018-02-06 21:15:42 +00:00
Hall Liu
3d30946e8e Revert "Check for location access on TelephonyRegistry"
This reverts commit 8d584f0a91.

Reason for revert: b/72967560

Change-Id: I9ca3c4a586e740a7b7d4cc5940ca8d4e4ebf3654
2018-02-06 18:13:36 +00:00
Pankaj Kanwar
f7a84a6c4b Merge "Fix the function to get baseband version correctly in telephony manager." 2018-02-06 05:13:23 +00:00
Brad Ebinger
83d77063a8 Merge changes from topic "ims_apis" am: de65acb915
am: 77230a0b3f

Change-Id: Ifd9a6ee66dae58dc3c1bfec6d7d6eed4f64a6b72
2018-02-06 03:16:39 +00:00
Brad Ebinger
ade4691364 Make ImsService API @SystemApi am: 0e370b4a02
am: a690700bca

Change-Id: Idd65b968636b4ee8bffe982afdb86f35db695ac2
2018-02-06 03:11:36 +00:00
Brad Ebinger
a210f34020 Integrate new MMTel APIs into the framework am: 5b1883b5f1
am: e904f40820

Change-Id: I3e6276418b2c6330bce65289f589980d4666de6a
2018-02-06 03:07:16 +00:00
Brad Ebinger
2c5dc6b6a0 Integrate ImsCallSessionListener API changes am: 6ed4ee6847
am: d627bb5039

Change-Id: Ia445ff1153483813d29b85723437b356da9996e2
2018-02-06 03:03:30 +00:00
pkanwar
ffe6a84e52 Fix the function to get baseband version correctly in telephony manager.
Bug: 62281863
Test: manual
Change-Id: I58cefcf9651e2dbe4058a8eca6a0875153df0b90
2018-02-05 18:48:36 -08:00
Brad Ebinger
a690700bca Make ImsService API @SystemApi
am: 0e370b4a02

Change-Id: I7e0e8d26e842d78999138fe09e1fc9e5951a6506
2018-02-05 23:10:53 +00:00
Brad Ebinger
e904f40820 Integrate new MMTel APIs into the framework
am: 5b1883b5f1

Change-Id: Id45f87f7399ddd8c2fd0046f5fa3f5364ec5f583
2018-02-05 23:05:33 +00:00
Brad Ebinger
d627bb5039 Integrate ImsCallSessionListener API changes
am: 6ed4ee6847

Change-Id: I41d63714efc2843fd7b1870fc99cefed074f91c3
2018-02-05 22:59:45 +00:00
Malcolm Chen
789289d731 Add strings and carrier config needed network service.
Add resource overlay and carrier config which will determine
which package / network services will be bound to.

Bug: 64132030
Test: regression tests
Change-Id: I5f515ec16b712e7be25f69e0e079d672227542b0
Merged-In: I5f515ec16b712e7be25f69e0e079d672227542b0
2018-02-05 14:25:22 -08:00
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
Xiangyu/Malcolm Chen
121647fe22 Merge "Update ServiceState to adapt NetworkService change." 2018-02-04 23:12:34 +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
Malcolm Chen
5ad2092112 Update ServiceState to adapt NetworkService change.
SST is re-routed to get cellular registration states from
CellularNetworkService. Updating ServiceState to adapt that
change.

Bug: 64132030
Test: unittest
Change-Id: Ifd557ce50a4419ead6125cda29c79d331508448e
2018-02-04 01:12:05 +00:00
Xiangyu/Malcolm Chen
1b368de832 Merge "Add strings and carrier config needed network service." 2018-02-04 01:11:03 +00:00
Hall Liu
3918780c28 Merge "Add missing return statement in setTempFileRootDirectory" am: d281b1a116 am: a376949816
am: 048b1517b4

Change-Id: I261b953da7e9edb048becbfcfffb3925f2371ec2
2018-02-04 00:57:17 +00:00
Pengquan Meng
099ede2617 Merge "Use IntDef for BCD_EXTENDED_TYPE" am: 97246476a7 am: a2311212a6
am: a8f341c47a

Change-Id: I5ddcab70828fec9f59de920feb085c867bd0059e
2018-02-04 00:49:55 +00:00
Hall Liu
e35ef2778e Merge "Rename MbmsDownloadSession#getDownloadStatus" am: a07d895f09 am: be305be046
am: c8cb3aad58

Change-Id: I0c5313fef938e6d9dfbb7779f336a3e3b34fe6c2
2018-02-04 00:05:22 +00:00
Jack Yu
c3415d2bc6 Merge "Added data service configuration support" am: 2e9bdd78f2
am: de0d22d73a

Change-Id: I47f6d9669c39060d70ba156bc121421c3dba9537
2018-02-03 06:19:08 +00:00
Jack Yu
2e9bdd78f2 Merge "Added data service configuration support" 2018-02-03 04:40:46 +00:00
Malcolm Chen
ec1022121b Add strings and carrier config needed network service.
Add resource overlay and carrier config which will determine
which package / network services will be bound to.

Bug: 64132030
Test: regression tests
Change-Id: I5f515ec16b712e7be25f69e0e079d672227542b0
2018-02-02 17:32:48 -08:00
Hall Liu
048b1517b4 Merge "Add missing return statement in setTempFileRootDirectory" am: d281b1a116
am: a376949816

Change-Id: Ib940c4a54821c23aff204e01a0bd097615864415
2018-02-03 01:17:54 +00:00
Pengquan Meng
a8f341c47a Merge "Use IntDef for BCD_EXTENDED_TYPE" am: 97246476a7
am: a2311212a6

Change-Id: I228c3af0f864e97ab28806745466bc2d72e293b3
2018-02-03 00:08:10 +00:00
Treehugger Robot
d281b1a116 Merge "Add missing return statement in setTempFileRootDirectory" 2018-02-02 22:09:34 +00:00
Pengquan Meng
97246476a7 Merge "Use IntDef for BCD_EXTENDED_TYPE" 2018-02-02 21:32:11 +00:00
Hall Liu
c8cb3aad58 Merge "Rename MbmsDownloadSession#getDownloadStatus" am: a07d895f09
am: be305be046

Change-Id: Ic126b1cbee30edbb8f90f3a61d206bbd75aa8d5f
2018-02-02 20:46:51 +00:00
Hall Liu
a07d895f09 Merge "Rename MbmsDownloadSession#getDownloadStatus" 2018-02-02 20:01:12 +00:00
Hall Liu
54ab6b91a8 Merge "Check for location access on TelephonyRegistry" am: 871202da2f am: cf59665a75
am: 56e6bd2cd1

Change-Id: If9989e10138a4fe923439c919807ca745d616043
2018-02-02 08:12:32 +00:00
Tyler Gunn
e2a66df86c Merge "Add call recording tone support." am: 8d5b08c430 am: eb74233ff9
am: 29d94726be

Change-Id: I67496b63f6a7f6362faed8c6a8cbff7cd665876c
2018-02-02 08:02:44 +00:00
Jordan Liu
058c408622 Merge "Add carrier config option to show call barring UI in CallSettings" am: 2aa0cdd1d2 am: ba0581bcf1
am: 32d87828e0

Change-Id: I5478643481f58006182f715b7c49816b0df89230
2018-02-02 07:54:35 +00:00
Alex Khlivnuik
c84f546547 Merge "Add CarrierConfig to displaying HD audio indicator for GSM/CDMA calls" am: 0be23629a8 am: c9cfb504f7
am: 114adea744

Change-Id: I606353211d342fd87c92103b4277129454a4ceea
2018-02-02 07:29:42 +00:00
nharold
4c6be5b585 Merge "CellSignalStrength cleanup" am: af7435ca1f am: 67a2db0a66
am: 252aeb18cb

Change-Id: Id9c95ec4ee347d686b411d7ec8119b62a8ef0fbf
2018-02-02 07:22:00 +00:00
Hall Liu
56e6bd2cd1 Merge "Check for location access on TelephonyRegistry" am: 871202da2f
am: cf59665a75

Change-Id: I8eee8b62f0e41fa7346126d29266dfd555550028
2018-02-02 04:37:13 +00:00
Tyler Gunn
29d94726be Merge "Add call recording tone support." am: 8d5b08c430
am: eb74233ff9

Change-Id: I1111bc80ec7dff95e6e1a5f53da22d5e65042060
2018-02-02 04:32:32 +00:00
Jordan Liu
32d87828e0 Merge "Add carrier config option to show call barring UI in CallSettings" am: 2aa0cdd1d2
am: ba0581bcf1

Change-Id: If09ae852661ab154804ad9f30a2eea0839f291c0
2018-02-02 04:27:27 +00:00
Alex Khlivnuik
114adea744 Merge "Add CarrierConfig to displaying HD audio indicator for GSM/CDMA calls" am: 0be23629a8
am: c9cfb504f7

Change-Id: I1ae7bb4715c9bffb7c6b2d57da17862f7c25ad55
2018-02-02 04:18:38 +00:00
nharold
252aeb18cb Merge "CellSignalStrength cleanup" am: af7435ca1f
am: 67a2db0a66

Change-Id: Ib405d3d8d2bc723dbddfaca4748bb34fcbae877a
2018-02-02 04:14:20 +00:00
Jack Yu
4fcd48db4b Merge "Added support for the new 1.2 data setup/deactivate API" am: a02d09a449
am: 8208b2ef2e

Change-Id: I699cc911c200c3f8d4390f19fc4cfb009c6090e9
2018-02-02 04:10:23 +00:00
Brad Ebinger
a7e7cfdedf Merge changes from topics "ims_sms_sms_ready", "ims_sms_rm_internal_sms", "ims_sms_disp" am: d6d9ff3c2d
am: 2390485616

Change-Id: I65687184fd12088804a905518b3613b2444be7eb
2018-02-02 04:03:45 +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
19628b43cf Modify ImsService API to accomodate compat
Modifies the ImsService API to accomodate
the ImsService compat layer for older
vender implementations

Bug: 63987047
Test: Manual, Telephony unit tests
Merged-In: Ifb2870414e3d80ef114b3c5fa00c5c5e1aa80b05
Change-Id: Ifb2870414e3d80ef114b3c5fa00c5c5e1aa80b05
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
Hall Liu
871202da2f Merge "Check for location access on TelephonyRegistry" 2018-02-01 23:05:22 +00: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