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
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
yinxu
392b0f1339
Fix the comments of onError() callback
...
Bug: 63718613
Test: Basic telephony sanity
Change-Id: Ibb4bf5fd907666d72c40bb0caf505e187937467b
2017-11-09 09:56:45 -08:00
Holly Jiuyu Sun
6a2877e5a9
Carrier confirmation code.
...
If confirmation code is null and required during downloading a profile,
returns a resovable error, and show ConfirmationCodeActivity. After we
get the confirmation code from the user, continue the operation.
Add the confirmationCode as a member in DownloadableSubscription.
Test: unit test, e2e on phone
Bug: 36730837
Change-Id: Ibe1e0fc5ddb736b411faf48ec9bea3c68972bb99
2017-11-08 19:49:04 -08:00
Brad Ebinger
25bd139e8f
Merge "Remove ImsService Feature Interfaces" am: abfdf0e03d am: 61fb76d9a0
...
am: 36521b89fe
2017-11-08 23:24:27 +00:00
Brad Ebinger
36521b89fe
Merge "Remove ImsService Feature Interfaces" am: abfdf0e03d
...
am: 61fb76d9a0
2017-11-08 23:13:35 +00:00
Brad Ebinger
abfdf0e03d
Merge "Remove ImsService Feature Interfaces"
2017-11-08 22:54:33 +00:00
yuemingw
607704394f
Merge "Add OWNED_BY field." am: 107141be5c am: 9c7be233c3
...
am: 592d620238
2017-11-08 19:54:54 +00:00
yuemingw
592d620238
Merge "Add OWNED_BY field." am: 107141be5c
...
am: 9c7be233c3
2017-11-08 19:45:14 +00:00
Treehugger Robot
107141be5c
Merge "Add OWNED_BY field."
2017-11-08 19:28:37 +00:00
Brad Ebinger
7153ff5ee2
Merge "Move ImsServiceProxy to opt/net/ims" am: b5d2f0c24f am: 6093305789
...
am: fcec01f040
2017-11-08 17:40:17 +00:00
Brad Ebinger
fcec01f040
Merge "Move ImsServiceProxy to opt/net/ims" am: b5d2f0c24f
...
am: 6093305789
2017-11-08 17:30:49 +00:00
Brad Ebinger
b5d2f0c24f
Merge "Move ImsServiceProxy to opt/net/ims"
2017-11-08 17:12:44 +00:00
Brad Ebinger
8eb4504148
Merge "Switch class hierarchy of ImsServiceProxy and compat" am: 7805de4002 am: 90f22d4bf6
...
am: e288472122
2017-11-08 16:51:41 +00:00
Brad Ebinger
e288472122
Merge "Switch class hierarchy of ImsServiceProxy and compat" am: 7805de4002
...
am: 90f22d4bf6
2017-11-08 16:37:36 +00:00
Brad Ebinger
7805de4002
Merge "Switch class hierarchy of ImsServiceProxy and compat"
2017-11-08 16:20:39 +00:00
yuemingw
cf263eb9da
Add OWNED_BY field.
...
Bug: 68208199
Test: later
Design doc: https://docs.google.com/document/d/1UEYjhRGSEwwccPLs_FzFD-IeOsVq63gxmAHNtDfnzAY/edit#heading=h.jza6dz6kh6bz
Change-Id: Ic78df7902523bad4b3d40bacb73b17d767226aac
2017-11-08 13:12:18 +00:00
Masaho Nishikawa
401843582a
Add config to use a display rule that ServiceState was considered
...
Add config to use a spn/plmn display rule that the roaming state of
ServiceState was considered. The default value is false.
Test: manual - Verified that PLMN/SPN which the carrier configuration
was considered is displayed.
Bug: 67835339
Change-Id: I05a4938ae51b03190e06e407c41c894b8feb8ea7
2017-11-08 19:47:40 +09:00
manabu, shimoda
14723e314c
Customize the default value of Enhanced 4G LTE mode
...
To control the default value by carrier configuration,
- Add a carrier option to control default Enhanced 4G LTE mode enabled.
- Remove initializing Settings.Global.ENHANCED_4G_MODE_ENABLED.
Test: manual - Checked that the "Enhanced 4G LTE mode" can be controlled
by carrier config.
Bug: 67725875
Change-Id: Ic714abcae5c388cc12e6c4b1f45e2abb07febf54
2017-11-08 19:37:23 +09:00
Jayachandran C
2635a89c8c
Remove the OEM hook implementation and usage
...
Vendors and OEMs shall use HIDL extension going forward
to send OEM specific message
Test: Basic Telephony Sanity
Bug: 34344851
Change-Id: I977004cf49f9c61b434dc2ded2effa29ace0f603
2017-11-07 19:36:50 -08:00
Jayachandran C
a8026ba2ad
Remove the OEM hook implementation and usage
...
Vendors and OEMs shall use HIDL extension going forward
to send OEM specific message
Test: Basic Telephony Sanity
Bug: 34344851
Change-Id: I977004cf49f9c61b434dc2ded2effa29ace0f603
2017-11-07 19:36:15 -08:00
TreeHugger Robot
0fcb56c991
Merge "Expose SmsManager#sendTextMessageWithoutPersisting as a public API"
2017-11-08 03:22:35 +00:00
Brad Ebinger
9a6369dbd5
Remove ImsService Feature Interfaces
...
The ImsService feature interfaces were designed
to support a flat ImsService AIDL. This is not
necessary anymore, so this interface is being
removed as part of prep for the new ImsService
definition.
Test: Manual
Change-Id: Iefbcd168441ce2547523cf3e6a99ab3de5f3f823
2017-11-07 11:05:51 -08:00
