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
2017-11-22 22:36:17 +00:00
Jordan Liu
e6e67e2396
Merge "Update javadocs for ACTION_CONFIGURE_VOICEMAIL"
...
am: 80aefae026
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
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
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
2017-11-18 00:48:07 +00:00
Cassie
4f95fd8532
Merge "Update the comments for all CellIdentity*."
...
am: 2610ad0556
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
2017-11-17 19:23:00 +00:00
Cassie Han
ea01b02f71
Merge "Allow unknown mcc/mnc when constructing a CellIdentity from Parcel."
...
am: 3df706dcd9
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
2017-11-17 02:40:58 +00:00
Jack He
a3185b2ff2
Merge "Telephony: Allow custom looper for OnSubscriptionsChangedListener"
...
am: 8055aec0da
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
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
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
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
2017-11-14 21:38:17 +00:00
yinxu
5b88b69067
Merge "Fix the comments of onError() callback" am: 5f291e5e06
...
am: 802f191b2b
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
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
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
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
2017-11-14 10:17:36 +00:00
Hall Liu
55b9486ac0
Add @TestApi for DownloadStateCallback CTS am: 63c5fd60ac am: b96d49e91f
...
am: caac5df325
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
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
2017-11-14 01:16:42 +00:00
Hall Liu
caac5df325
Add @TestApi for DownloadStateCallback CTS am: 63c5fd60ac
...
am: b96d49e91f
2017-11-14 01:11:51 +00:00
Jordan Liu
0f113b2f25
Merge "Customize the default value of Enhanced 4G LTE mode"
2017-11-13 21:53:24 +00:00
Cassie
993203c7e0
Allow unknown mcc/mnc when constructing a CellIdentity from Parcel.
...
Bug: 69096589
Bug: 63984327
Test: Basic telephony sanity
Change-Id: I0fe5b3a17b1a68c918f912ee98a00cfec4c5657b
2017-11-13 09:14:59 -08:00
Hall Liu
b96d49e91f
Add @TestApi for DownloadStateCallback CTS
...
am: 63c5fd60ac
2017-11-10 21:10:01 +00:00
Hall Liu
f6b2b77e40
Merge changes from topics "embms-cts-6", "embms-cts-5"
...
* changes:
Add @TestApi for MbmsDownloadReceiver CTS
Add @TestApi for DownloadStateCallback CTS
2017-11-10 20:46:19 +00:00
Jayachandran Chinnakkannu
e5cfbed9f8
Merge "Remove the OEM hook implementation and usage" am: 413a308126
...
am: 80662de731
2017-11-10 00:53:54 +00:00
Jayachandran Chinnakkannu
413a308126
Merge "Remove the OEM hook implementation and usage"
2017-11-10 00:31:39 +00:00
Jiuyu Sun
17da6d2a3f
Merge "Carrier confirmation code."
2017-11-09 20:31:32 +00:00
Jordan Liu
08cb5e2d15
Merge "Add config to use a display rule that ServiceState was considered" am: bbaa19cad3 am: cd89929497
...
am: c943355052
2017-11-09 20:20:21 +00:00
Jordan Liu
c943355052
Merge "Add config to use a display rule that ServiceState was considered" am: bbaa19cad3
...
am: cd89929497
2017-11-09 19:35:09 +00:00
Jordan Liu
bbaa19cad3
Merge "Add config to use a display rule that ServiceState was considered"
2017-11-09 18:24:16 +00:00
Jayachandran Chinnakkannu
45a9600e68
Merge "Remove the OEM hook implementation and usage"
2017-11-09 18:00:28 +00:00
