Commit Graph

5236 Commits

Author SHA1 Message Date
Pengquan Meng
b414149cec Merge "fixed CdmaSmsAddress parser" am: b00f00e74b am: c8ec8a5e56
am: 3ca2c2dab8

Change-Id: Ie28175cc6946f4e53069895c0ea9f28634b9a96f
2017-11-30 00:26:13 +00:00
Pengquan Meng
c8ec8a5e56 Merge "fixed CdmaSmsAddress parser"
am: b00f00e74b

Change-Id: I041c8f3937882b7fd78adf2c2f2cf87fc225b936
2017-11-29 23:52:41 +00:00
Pengquan Meng
b00f00e74b Merge "fixed CdmaSmsAddress parser" 2017-11-29 23:38:29 +00:00
Pengquan Meng
6dabb40ae3 fixed CdmaSmsAddress parser
The digit mode of CdmaSmsAddress is incorrect for international
address.

See 3GPP2 C.S0015-B section 3.4.3.3 Address Parameters for the spec of
CdmaSmsAddress.

Also see the table from 3GPP2 C.S005-D, table2.7.1.3.2.4-2.

Bug: 34805351
Test: unit test
Change-Id: I542a717986009b01d19aef5e61964f03b216a162
2017-11-28 18:02:31 -08:00
Jordan Liu
7a42c3614e Merge "Add carrier config variable to hide manage IMS conference call button"
am: dc98d6e44b

Change-Id: I474338d3475706f856e63fc8c558850c3afd0bb3
2017-11-28 22:00:50 +00:00
Jordan Liu
dc98d6e44b Merge "Add carrier config variable to hide manage IMS conference call button" 2017-11-28 21:40:01 +00:00
Wei Huang
0385e3a547 Add carrier config variable to hide manage IMS conference call button
Add carrier config to determine whether manage IMS conference calls
is supported by a carrier.

Test: not tested since a new config is just added
Bug: 28729600
Change-Id: I1000830a85814150658b62ea9add72bfb83bbba0
Merged-In: I1000830a85814150658b62ea9add72bfb83bbba0
2017-11-28 10:25:25 -08:00
Jack Yu
3221d23138 Merge "Moved DataProfile from telephony internal hidden API to System API"
am: 24cd7cbd1e

Change-Id: Ica76a82b03f6bb0623a98480ae1c2fbc34d07337
2017-11-28 17:39:01 +00:00
Jordan Liu
5b8f69b08e Merge "Add carrier config variable to hide manage IMS conference call button" 2017-11-28 01:50:56 +00:00
Jack Yu
1d1022e445 Moved DataProfile from telephony internal hidden API to System API
This is the preliminary change in order to make the new data call
setup API for IWLAN refactoring.

Test: Telephony sanity tests + unit tests
bug: 64132030

Merged-In: Ib96dc3dd577def0a428e2f5cdb5fb7f742120020
Change-Id: Ib96dc3dd577def0a428e2f5cdb5fb7f742120020
(cherry picked from commit fc84bb5f5c)
2017-11-27 14:36:15 -08:00
Jack Yu
fc84bb5f5c Moved DataProfile from telephony internal hidden API to System API
This is the preliminary change in order to make the new data call
setup API for IWLAN refactoring.

Test: Telephony sanity tests + unit tests
bug: 64132030

Change-Id: Ib96dc3dd577def0a428e2f5cdb5fb7f742120020
2017-11-27 09:37:18 -08:00
Jeff Sharkey
90cbd7e4e5 Merge changes from topic "predicatez"
* changes:
  Emit all APIs using Predicates.
  Massage APIs for upcoming doclava change.
2017-11-23 02:00:06 +00:00
Jordan Liu
e62951f152 Merge "Update javadocs for ACTION_CONFIGURE_VOICEMAIL" am: 80aefae026 am: e6e67e2396
am: 59e3c519f5

Change-Id: Ibd99a60779e93105aeed2bc8a9f573b4f9d3723e
2017-11-22 22:36:17 +00:00
Jordan Liu
e6e67e2396 Merge "Update javadocs for ACTION_CONFIGURE_VOICEMAIL"
am: 80aefae026

Change-Id: Ie18492114c58d1c83c060712d2a936687353ea99
2017-11-22 22:17:47 +00:00
Jordan Liu
80aefae026 Merge "Update javadocs for ACTION_CONFIGURE_VOICEMAIL" 2017-11-22 22:09:33 +00:00
Brad Ebinger
efc23a4810 Merge "Refactor ImsService to AIDL" am: 8a02c63f16 am: e575ad10ca
am: f9c3af2797

Change-Id: Ia51168c15e10bd20c67460edd0861582a0ac3cb9
2017-11-22 19:42:33 +00:00
Jeff Sharkey
9650a435ed Massage APIs for upcoming doclava change.
These changes are needed to ensure that "checkapi" doesn't claim
that we're changing the API after an upcoming doclava change.

Test: manual inspection of API text files
Bug: 69505783
Change-Id: I8292ba80cc65b7dd78f0e9dba4fcc7ffcedfab9c
2017-11-22 12:28:09 -07:00
Brad Ebinger
e575ad10ca Merge "Refactor ImsService to AIDL"
am: 8a02c63f16

Change-Id: I195d7ccff8498241b6c7be819d2ee96b661d51e1
2017-11-22 19:23:16 +00:00
Brad Ebinger
8a02c63f16 Merge "Refactor ImsService to AIDL" 2017-11-22 19:16:21 +00:00
Jordan Liu
d9464e2813 Merge "Update documentation for enhanced 4g lte preference" 2017-11-20 19:56:37 +00:00
Cassie
996ddbb810 Merge "Update the comments for all CellIdentity*." am: 2610ad0556 am: 4f95fd8532
am: 06b73ece42

Change-Id: I1b0d1af77cde5acea8218d2d7e3d92d6dd7ca846
2017-11-18 00:48:07 +00:00
Cassie
4f95fd8532 Merge "Update the comments for all CellIdentity*."
am: 2610ad0556

Change-Id: I81f4e4a6bd0960ce3d2d51bfe15711a5c3eda9fb
2017-11-18 00:27:09 +00:00
Cassie
13df901de7 Update the comments for all CellIdentity*.
Bug: 63984327
Test: Basic telephony sanity
Change-Id: Icb9ba99cefb93a7c4a39cbc653ae046df8649cf9
2017-11-17 14:16:01 -08:00
Cassie Han
308e7ae68d Merge "Allow unknown mcc/mnc when constructing a CellIdentity from Parcel." am: 3df706dcd9 am: ea01b02f71
am: 5c1b92c512

Change-Id: I139427f61310d568a51ece7297804e33b54fddaf
2017-11-17 19:23:00 +00:00
Cassie Han
ea01b02f71 Merge "Allow unknown mcc/mnc when constructing a CellIdentity from Parcel."
am: 3df706dcd9

Change-Id: I83ebfa9404af1b8045c6d9c7e8a3634469420adc
2017-11-17 19:01:44 +00:00
Cassie Han
3df706dcd9 Merge "Allow unknown mcc/mnc when constructing a CellIdentity from Parcel." 2017-11-17 18:47:59 +00:00
Jack He
98e1d3b296 Merge "Telephony: Allow custom looper for OnSubscriptionsChangedListener" am: 8055aec0da am: a3185b2ff2
am: e778568995

Change-Id: I2cd2414e591fc224364fc286696d910a1ab0b710
2017-11-17 02:40:58 +00:00
Jack He
a3185b2ff2 Merge "Telephony: Allow custom looper for OnSubscriptionsChangedListener"
am: 8055aec0da

Change-Id: If1757262ce5da5f2ab1055cfb238ea570550f7f7
2017-11-17 02:19:02 +00:00
Jack He
9fc75740e1 Telephony: Allow custom looper for OnSubscriptionsChangedListener
* Add OnSubscriptionsChangedListener(Looper looper) constructor

Bug: 69429540
Test: Use this constructor in HeadsetPhoneState.java
Change-Id: I37b6c8d970384466527acc8df7a818625865ab16
2017-11-16 16:03:28 -08:00
Brad Ebinger
216b3ce485 Refactor ImsService to AIDL
The ImsService was originally designed as a flat
interface, all ImsFeatures would be forwarded
through ImsService. This has been refactored to
using AIDL interfaces for each feature, as it
is more straightforward.

Test: Manual, Telephony IMS Unit Tests
Change-Id: Ibe065ddec6f180eabda03cf06f842c642a11114f
2017-11-16 21:28:36 +00:00
Cassie
ae5885d54e Allow unknown mcc/mnc when constructing a CellIdentity from Parcel.
Bug: 63984327
Test: Basic telephony sanity
Change-Id: Ia7670b7cd49db244e7c8309419ea8d7b1280a7fa
2017-11-15 17:11:17 -08:00
Cassie Han
b8c621ab82 Merge "Revert "Allow unknown mcc/mnc when constructing a CellIdentity from Parcel."" am: 9b08e4cb8d am: 866d2d553e
am: 03e7512fc7

Change-Id: I344283ebf5971461f8aa2d712546b7715f090dbf
2017-11-15 23:54:49 +00:00
Cassie Han
866d2d553e Merge "Revert "Allow unknown mcc/mnc when constructing a CellIdentity from Parcel.""
am: 9b08e4cb8d

Change-Id: Ie34638da4087987c19bbc7f9935854ca8fa5688d
2017-11-15 23:29:37 +00:00
Cassie Han
9b08e4cb8d Merge "Revert "Allow unknown mcc/mnc when constructing a CellIdentity from Parcel."" 2017-11-15 23:21:33 +00:00
Cassie Han
2200da1cdc Revert "Allow unknown mcc/mnc when constructing a CellIdentity from Parcel."
Bug: 69349963
Bug: 69096589
Bug: 63984327

This reverts commit 993203c7e0.

Change-Id: I52839aa5991541399651904587aa342a858a5915
2017-11-15 17:32:31 +00:00
Jordan Liu
d635011fce Update documentation for enhanced 4g lte preference
Test: manual
Bug: 67725875
Change-Id: I79bbb25d69da1482367c5d5be4e0d1d742ef3676
2017-11-14 13:45:19 -08:00
yinxu
cdf403a455 Merge "Fix the comments of onError() callback" am: 5f291e5e06 am: 802f191b2b
am: 5b88b69067

Change-Id: I54a9769dc9c62bce97205fe534f38cf27d0a5f8b
2017-11-14 21:38:17 +00:00
yinxu
5b88b69067 Merge "Fix the comments of onError() callback" am: 5f291e5e06
am: 802f191b2b

Change-Id: I949d1c3ed1155af86e19428ca1e4877303baaaa7
2017-11-14 20:32:59 +00:00
Xin Li
220871a697 Merge commit '98e12851336b7db16e583f9afac63ecc97465980' from
oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master.

Change-Id: Ia7b8da4a00d215160e4a4fa40f6044208d1297b7
Merged-In: I19846d2a3ee27aecbae2367a74ee49082eea154d
2017-11-14 12:31:11 -08:00
Treehugger Robot
5f291e5e06 Merge "Fix the comments of onError() callback" 2017-11-14 20:12:02 +00:00
Cassie
33d0a05001 Merge "Allow unknown mcc/mnc when constructing a CellIdentity from Parcel." am: 45e1c58591 am: 59439e38a6
am: 2c9a0c746f

Change-Id: I79db893680f01f9b252432c418d1ecf5fa3bb25e
2017-11-14 17:21:28 +00:00
Cassie
2c9a0c746f Merge "Allow unknown mcc/mnc when constructing a CellIdentity from Parcel." am: 45e1c58591
am: 59439e38a6

Change-Id: Ia6ff98854a32b54b5f4a2bb8c5b533e62ff27b65
2017-11-14 17:07:26 +00:00
Jordan Liu
eaa8032ab9 Merge "Customize the default value of Enhanced 4G LTE mode" am: 0f113b2f25 am: df79be072d
am: 92c4fa8570

Change-Id: I0c40a2435feb57c7ebd90491cd0c3055f47b7a07
2017-11-14 16:51:27 +00:00
Treehugger Robot
45e1c58591 Merge "Allow unknown mcc/mnc when constructing a CellIdentity from Parcel." 2017-11-14 16:42:41 +00:00
Hall Liu
9c92cd2e87 Merge changes from topics "embms-cts-6", "embms-cts-5" am: f6b2b77e40 am: 2cd6464e9b
am: 8fd59b38b7

Change-Id: I1217efc28d9d9c825dd9bf361d7f2f35510b4b27
2017-11-14 10:17:36 +00:00
Hall Liu
55b9486ac0 Add @TestApi for DownloadStateCallback CTS am: 63c5fd60ac am: b96d49e91f
am: caac5df325

Change-Id: Ifde502de2ae2aa3b22ea90a5f9bd5ece4746284e
2017-11-14 10:13:27 +00:00
Xiangyu/Malcolm Chen
44bb533e74 Merge "Move Ims related settings from global setting to subscription db." 2017-11-14 02:51:21 +00:00
Jordan Liu
92c4fa8570 Merge "Customize the default value of Enhanced 4G LTE mode" am: 0f113b2f25
am: df79be072d

Change-Id: I65d3b0a60ad69cb6e5c07297eeb8166230b9f720
2017-11-14 01:57:39 +00:00
Hall Liu
8fd59b38b7 Merge changes from topics "embms-cts-6", "embms-cts-5" am: f6b2b77e40
am: 2cd6464e9b

Change-Id: I33811f8c6198da52d7ec5a863528e8c6ed723f2d
2017-11-14 01:16:42 +00:00
Hall Liu
caac5df325 Add @TestApi for DownloadStateCallback CTS am: 63c5fd60ac
am: b96d49e91f

Change-Id: I6ba017e942c0da8a345e34b45badde6662a5abdd
2017-11-14 01:11:51 +00:00