Commit Graph

5185 Commits

Author SHA1 Message Date
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
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
Hall Liu
b96d49e91f Add @TestApi for DownloadStateCallback CTS
am: 63c5fd60ac

Change-Id: I3ffa9e070f014a0280486cd5a9a58af205ac7aab
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

Change-Id: I1e184e76efe01daf33c559e0a2d723bd4e9fb110
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

Change-Id: I51f2c8c7bf6f2fa5d62417459964a85e36bd4302
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

Change-Id: Ibc4bcf689d31d0841f97eac67578705ccc59dc8f
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
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

Change-Id: Ib0bc09870473c437639a4026835a0bc26e6c6b0d
2017-11-08 23:24:27 +00:00
Brad Ebinger
36521b89fe Merge "Remove ImsService Feature Interfaces" am: abfdf0e03d
am: 61fb76d9a0

Change-Id: Ib8602579b1028fd086c4fc0a13897a671bb6b73e
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

Change-Id: Ib023411485c971815f05e0b1e5894adbc725a6d8
2017-11-08 19:54:54 +00:00
yuemingw
592d620238 Merge "Add OWNED_BY field." am: 107141be5c
am: 9c7be233c3

Change-Id: Icf11a35867625a5a47450f5dc9a1b05ec00de502
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

Change-Id: Ia27032259a31a585ac93ac90b8251af7d7e2f76d
2017-11-08 17:40:17 +00:00
Brad Ebinger
fcec01f040 Merge "Move ImsServiceProxy to opt/net/ims" am: b5d2f0c24f
am: 6093305789

Change-Id: Ic1b21cd9a0fc906601bf37bf5e71aafdcbf0bd47
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

Change-Id: Icde853dde9257a0314b0ebe1619edb7eb55d216d
2017-11-08 16:51:41 +00:00
Brad Ebinger
e288472122 Merge "Switch class hierarchy of ImsServiceProxy and compat" am: 7805de4002
am: 90f22d4bf6

Change-Id: I227b081551539e4299f63c304a4e27d9be2070c7
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
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
Jordan Liu
b41fa4ead5 Merge "Add a carrier config indicating whether user can edit a voicemail number" am: 1f8ee4ff25
am: e968d500f5

Change-Id: Ifc4a120e14dd2e2bc6f2bdfe06acfffdf6837bea
2017-11-07 18:51:57 +00:00
Jordan Liu
1f8ee4ff25 Merge "Add a carrier config indicating whether user can edit a voicemail number" 2017-11-07 18:28:33 +00:00
Brad Ebinger
8f291b18a1 Move ImsServiceProxy to opt/net/ims
This code is very tightly coupled with ImsManager
and should exist as part of the telephony IMS
code.

Test: Manual
Change-Id: If7b8ec73409daa7f1c1d27878242b4335db38e8a
2017-11-07 10:01:58 -08:00
Brad Ebinger
06b6878310 Switch class hierarchy of ImsServiceProxy and compat
The compat class should be a subclass of the
ImsServiceProxy, not the other way around.

Test: Manual
Change-Id: I2a2d37edaa6b68815c99988882957bf913236f25
2017-11-07 10:01:58 -08:00
Jordan Liu
7e9837ed70 Merge "Move isServiceReady to ImsServiceProxyCompat" am: e158cdaaa5 am: 909a889436
am: 1c664d0b8e

Change-Id: I7e1a31f1e1ea45de09e5aa610c8fc79ce01495f0
2017-11-07 00:58:26 +00:00
Jordan Liu
1c664d0b8e Merge "Move isServiceReady to ImsServiceProxyCompat" am: e158cdaaa5
am: 909a889436

Change-Id: I24c1b7009f54b20ba5231a81ecf67150f7345df1
2017-11-07 00:33:20 +00:00
Jordan Liu
e158cdaaa5 Merge "Move isServiceReady to ImsServiceProxyCompat" 2017-11-07 00:07:11 +00:00
Qi Wang
29431f8f13 Merge "Display the HD icon in the Call Log" am: 3ef58c56b6 am: 50fb8ff6da
am: 051d6b369b

Change-Id: I557c4a58405d33e1b54db7e8f054f030a64aa6a5
2017-11-06 20:01:03 +00:00
Qi Wang
051d6b369b Merge "Display the HD icon in the Call Log" am: 3ef58c56b6
am: 50fb8ff6da

Change-Id: Idffacab6edf8bdaf7fb133560f5e9d50cc2c28de
2017-11-06 19:49:46 +00:00
Qi Wang
3ef58c56b6 Merge "Display the HD icon in the Call Log" 2017-11-06 19:28:24 +00:00
Chen Xu
e9cbcf42ad Merge "new columns of carrierId DB" am: 9c4b4afcbc
am: c5d5be72a3

Change-Id: I0400b0218a3a92312aec3ca668b5b0025901ed97
2017-11-03 21:27:22 +00:00
Chen Xu
4c9f65960c Merge "new columns of carrierId DB" 2017-11-03 20:23:06 +00:00
fionaxu
3d0ad1f8c0 new columns of carrierId DB
Bug: 64131637
Test: Unit test CarrierIdProviderTest.java
Change-Id: I5e1d061d39248be12dd1e6ff1488dd3268f5f3ae
(cherry picked from commit a9214ba0b8)
2017-11-03 12:19:16 -07:00
Suresh Koleti
17898168a6 Move isServiceReady to ImsServiceProxyCompat
-- Move isServiceReady from ImsServiceProxy to its base class
   ImsServiceProxyCompat to use in ImsManager.

Test: Manual
Bug: 63920021
Change-Id: I0e136ffe8490a3ba985bfb5992c1ff2176e610fe
2017-11-03 18:29:25 +05:30
fionaxu
a9214ba0b8 new columns of carrierId DB
Bug: 64131637
Test: Unit test CarrierIdProviderTest.java
Change-Id: I5e1d061d39248be12dd1e6ff1488dd3268f5f3ae
2017-11-02 16:36:41 -07:00
Pengquan Meng
b7a337025f Merge "Fix getSimOperator to return mccmnc based on subId" am: 87a336846e am: 44dc116739
am: 402f64313e

Change-Id: I7fdec39374578ca2c3ca0d34b50d32842cf7efc0
2017-11-02 03:27:00 +00:00
Jordan Liu
7930c4f1f9 Merge "Added interface to get the decimal digit from hex ICCID." am: c173c93c1c am: 7f25f6d720
am: 4d9005226c

Change-Id: I320ea9e61cd369be8d1d2f03b5733a0e1ae00abe
2017-11-02 03:18:52 +00:00