Xiangyu/Malcolm Chen
4aa502e96a
Merge "Allow addSubscriptionsIntoGroup with grouUuid that isn't assigned."
2019-08-23 05:47:35 +00:00
Malcolm Chen
779269fc4d
Allow addSubscriptionsIntoGroup with grouUuid that isn't assigned.
...
Bug: 133776718
Test: manual & unittest
Change-Id: I06b1e348e67d6283a482010d947bf749574d90f0
2019-08-22 13:07:30 -07:00
Pengquan Meng
7ec30e5e9f
Merge "Add fields to Cellbroadcast" into qt-qpr1-dev am: 455fc80450
...
am: ecd1c9b026
Change-Id: Ib17d27aae5f9d55be3a8e34f43f6c77f1a2445df
2019-08-22 12:49:17 -07:00
Pengquan Meng
ecd1c9b026
Merge "Add fields to Cellbroadcast" into qt-qpr1-dev
...
am: 455fc80450
Change-Id: I156d824df5b99b4427a8c3b5d189ba207bca8a1d
2019-08-22 12:07:03 -07:00
Pengquan Meng
455fc80450
Merge "Add fields to Cellbroadcast" into qt-qpr1-dev
2019-08-22 18:31:05 +00:00
Pengquan Meng
02cfb3bdc8
Add fields to Cellbroadcast
...
This add some fields to CellBroadcasts in order to support the WEA 3.0
geo-fencing.
Bug: 123096618
Test: atest TelephonyProviderTests
Merged-In: Ied0780cb1b9993e6d8cdb80131ba2f8b8affcb54
Change-Id: Ied0780cb1b9993e6d8cdb80131ba2f8b8affcb54
(cherry picked from commit 5c6e975ce4a973619f20167644475b04e663ee4e)
2019-08-22 18:24:38 +00:00
SongFerng Wang
549b5bb235
Merge "Create carrier config to define specific default value of APN types." into qt-qpr1-dev am: c1a2db2320
...
am: 18fdaa984d
Change-Id: I2d3528a2cf3c55ed2be24e15806c7df0a45468ae
2019-08-22 03:15:58 -07:00
SongFerng Wang
18fdaa984d
Merge "Create carrier config to define specific default value of APN types." into qt-qpr1-dev
...
am: c1a2db2320
Change-Id: Ic10ebf22cec16021779643bf51b527b2a72a1534
2019-08-22 03:01:05 -07:00
SongFerng Wang
c1a2db2320
Merge "Create carrier config to define specific default value of APN types." into qt-qpr1-dev
2019-08-22 09:49:27 +00:00
Nazanin Bakhshi
4dee36149f
add checking for carrierConfigs certificates for psim am: 65371b27c8
...
am: 8ae6b4b43b
Change-Id: Ieb2f220f8740a31a91359e8534d3cb31b178b2d5
2019-08-21 20:02:22 -07:00
Nazanin Bakhshi
8ae6b4b43b
add checking for carrierConfigs certificates for psim
...
am: 65371b27c8
Change-Id: I1b23a99d10459dd5a8299535ffe552f26d3b3b45
2019-08-21 19:33:49 -07:00
Sarah Chin
76bb761a8e
Merge "Changed regex matching for MCC and MNC" into qt-qpr1-dev
...
am: cb97705a1c
Change-Id: Ic9193590b58b9265bb7a3e350f29d969de1c4ef6
2019-08-21 14:49:22 -07:00
Nazanin Bakhshi
65371b27c8
add checking for carrierConfigs certificates for psim
...
Test: utests
Bug: 139133814
Change-Id: I2d5cf7ee4e516ff16a67a5fbef6674a380095888
2019-08-21 21:45:23 +00:00
Nazanin Bakhshi
e6e214e227
Merge "add certs to carrier configs and store them as UiccAccessRules" into qt-qpr1-dev
2019-08-21 21:42:24 +00:00
Sarah Chin
cb97705a1c
Merge "Changed regex matching for MCC and MNC" into qt-qpr1-dev
2019-08-21 21:26:53 +00:00
Hall Liu
006f4e0ffd
Merge "Add carrier config for ignoring user RTT setting" into qt-r1-dev am: 5ca4cef9b5 am: ecb319ce06
...
am: 5ee40c2be0
Change-Id: I9fdad35d47e084cdd445a187f22d7f471692681a
2019-08-21 12:31:56 -07:00
Hall Liu
5ee40c2be0
Merge "Add carrier config for ignoring user RTT setting" into qt-r1-dev am: 5ca4cef9b5
...
am: ecb319ce06
Change-Id: Id400b5cda1fbdc6f9f7d9ae32198c304f694ec0d
2019-08-21 12:08:30 -07:00
Sarah Chin
e3228ca3fd
Changed regex matching for MCC and MNC
...
Bug: 137942727
Test: atest CellIdentityTest
Change-Id: Iaeb9ff9e2a5a82be66855378831cd52ee49e3c5c
(cherry picked from commit cb76b14fdf )
Merged-In: Iaeb9ff9e2a5a82be66855378831cd52ee49e3c5c
2019-08-21 18:37:51 +00:00
Hall Liu
562a3f81c6
Merge "Add carrier config for ignoring user RTT setting" into qt-r1-dev
...
am: 5ca4cef9b5
Change-Id: I15a0dc85d3a2c9be599deed826696e4a1c542fce
2019-08-21 11:37:35 -07:00
Hall Liu
ecb319ce06
Merge "Add carrier config for ignoring user RTT setting" into qt-r1-dev
...
am: 5ca4cef9b5
Change-Id: I983a1e66216f0c1203417870fb7c3f4ad4be1ea7
2019-08-21 11:37:34 -07:00
Hall Liu
5ca4cef9b5
Merge "Add carrier config for ignoring user RTT setting" into qt-r1-dev
2019-08-21 18:28:20 +00:00
Nazanin Bakhshi
6a3a71cb2b
add certs to carrier configs and store them as UiccAccessRules
...
Bug: 138388637
Test: tested with local override and made sure they are read and parsed
Change-Id: I50fb11444f0da33ae48683b834e6ca50941ad1b7
Merged-In: I50fb11444f0da33ae48683b834e6ca50941ad1b7
2019-08-21 18:00:27 +00:00
SongFerng Wang
ee1ac4637c
Merge "To modify 5G icon carrier config's comment: 5GPlus to 5G_Plus" into qt-qpr1-dev am: 712fc079a0
...
am: 33f5edee25
Change-Id: Id68bcd06b1893aceaee1a37032b0f05fbd024a8e
2019-08-20 20:41:25 -07:00
James Lin
8461060744
Merge "Remove the Phone registration error notification" into qt-qpr1-dev am: 507bc4ac36
...
am: 22c7dec4b7
Change-Id: I5b38cf4128c6a1156fb89649675217a82c796d5a
2019-08-20 20:37:25 -07:00
SongFerng Wang
33f5edee25
Merge "To modify 5G icon carrier config's comment: 5GPlus to 5G_Plus" into qt-qpr1-dev
...
am: 712fc079a0
Change-Id: If745d92f94ce75b0298dbc66f53731a1faab09c4
2019-08-20 20:32:30 -07:00
James Lin
22c7dec4b7
Merge "Remove the Phone registration error notification" into qt-qpr1-dev
...
am: 507bc4ac36
Change-Id: Ia3e54831a25be0dca455e9ba78d76cfb8842858b
2019-08-20 20:27:42 -07:00
SongFerng Wang
712fc079a0
Merge "To modify 5G icon carrier config's comment: 5GPlus to 5G_Plus" into qt-qpr1-dev
2019-08-21 03:16:52 +00:00
James Lin
507bc4ac36
Merge "Remove the Phone registration error notification" into qt-qpr1-dev
2019-08-21 03:14:05 +00:00
Nazanin Bakhshi
81b2b4536f
Merge "add certs to carrier configs and store them as UiccAccessRules" into qt-qpr1-dev-plus-aosp
2019-08-21 01:12:52 +00:00
Jayachandran Chinnakkannu
971e38cff3
Merge "Fixed null callback issue" into qt-r1-dev am: f3395734e8 am: 0a1f1e0389
...
am: 0677b837d5
Change-Id: Ic4eb6778fe456a8da4deb4d58e69ffecc9023a96
2019-08-20 11:49:34 -07:00
SongFerngWang
b532af6c72
To modify 5G icon carrier config's comment: 5GPlus to 5G_Plus
...
Bug: 138932186
Test: build pass
Change-Id: Ic8625f44a5ad23a307cfb280b85bfb27da2f2b06
2019-08-21 02:42:20 +08:00
Jayachandran Chinnakkannu
0677b837d5
Merge "Fixed null callback issue" into qt-r1-dev am: f3395734e8
...
am: 0a1f1e0389
Change-Id: I13629ef2b8115381ebbe2438e4d68072fad5cfdc
2019-08-20 11:10:36 -07:00
Nazanin Bakhshi
600a9fee3a
add certs to carrier configs and store them as UiccAccessRules
...
Bug: 138388637
Test: tested with local override and made sure they are read and parsed
Change-Id: I50fb11444f0da33ae48683b834e6ca50941ad1b7
2019-08-20 11:07:11 -07:00
Jayachandran Chinnakkannu
d084c899d9
Merge "Fixed null callback issue" into qt-r1-dev
...
am: f3395734e8
Change-Id: I438b53eec3edf8de1f9046ea820f7fdfd17f4249
2019-08-20 10:51:22 -07:00
Jayachandran Chinnakkannu
0a1f1e0389
Merge "Fixed null callback issue" into qt-r1-dev
...
am: f3395734e8
Change-Id: If431a32bf6a44235599737b0295d2bb1cf491acf
2019-08-20 10:50:30 -07:00
SongFerngWang
c87140c940
Create carrier config to define specific default value of APN types.
...
Create Carrier config for default value of APN types field if not specified by
user when adding/modifying an APN.
Bug: 139320184
Test: Enter empty APN type and check if only default is added into
APN.
Change-Id: Ie6984e4eb741b1ac0a245b40e7102cc2c0c25b20
2019-08-20 13:31:27 +00:00
Nathan Harold
7600721279
Merge "Add Debounce text to ACTION_NETWORK_COUNTRY_CHANGE" into qt-qpr1-dev am: a9df8f6993
...
am: a9e34e367f
Change-Id: Ibd5badfa8d4183bb39109ca86b7a0db0e9f343bc
2019-08-19 17:46:10 -07:00
Nathan Harold
a9e34e367f
Merge "Add Debounce text to ACTION_NETWORK_COUNTRY_CHANGE" into qt-qpr1-dev
...
am: a9df8f6993
Change-Id: I67052710756bf91f965c874cb3e42c8b531a1a51
2019-08-19 17:24:27 -07:00
Nathan Harold
a9df8f6993
Merge "Add Debounce text to ACTION_NETWORK_COUNTRY_CHANGE" into qt-qpr1-dev
2019-08-19 23:58:38 +00:00
SongFerng Wang
76ed8e15ab
Merge "Extends carrier config KEY_5G_ICON_CONFIGURATION_STRING to support more scenarios." into qt-qpr1-dev am: 052a08bcda
...
am: bfc0a8de45
Change-Id: I03b5c3f447fb6adfd7988ee68998969c28888243
2019-08-19 13:44:57 -07:00
SongFerng Wang
bfc0a8de45
Merge "Extends carrier config KEY_5G_ICON_CONFIGURATION_STRING to support more scenarios." into qt-qpr1-dev
...
am: 052a08bcda
Change-Id: I48b5d230015a4d61556fda1f4bd65681136c12d7
2019-08-19 13:24:58 -07:00
SongFerng Wang
052a08bcda
Merge "Extends carrier config KEY_5G_ICON_CONFIGURATION_STRING to support more scenarios." into qt-qpr1-dev
2019-08-19 18:26:03 +00:00
Nazanin Bakhshi
ce81d32525
Merge "add certs to carrier configs and store them as UiccAccessRules"
2019-08-19 17:52:43 +00:00
Jack Yu
09ef1cb126
Fixed null callback issue
...
Fixed the vendor data/network service non-responsive
issue. The callback binder passed from frameworks
might be GC'd so that vendor data/network service skipped
calling the callback. This eventually caused data
connection state machine messed up.
Fixed by turning the weak refernce to the callback into
a strong reference. This ensure the binder alive when
vendor service needs to invoke the callback.
Test: Telephony sanity tests
Bug: 139076980
Change-Id: Ica0b7b810ffd5416ffd1b2b61f7ebc4af0dcb8ce
2019-08-19 10:02:11 -07:00
Leland Miller
7e98e3fe48
Merge "Fix incorrect descriptions under SMS contract" am: 8f48cb7e7e am: 6ef5b6c183 am: 4e16f07ddf am: ecd1d67584
...
am: b6d51f117b
Change-Id: I7ca8d0dd5068f190cda7f4ccb85110b6b74f51b8
2019-08-19 08:45:32 -07:00
Leland Miller
b6d51f117b
Merge "Fix incorrect descriptions under SMS contract" am: 8f48cb7e7e am: 6ef5b6c183 am: 4e16f07ddf
...
am: ecd1d67584
Change-Id: I4193a4f3f6b10d41c4ae3049d6d9267fc9daa778
2019-08-19 08:36:26 -07:00
Leland Miller
ecd1d67584
Merge "Fix incorrect descriptions under SMS contract" am: 8f48cb7e7e am: 6ef5b6c183
...
am: 4e16f07ddf
Change-Id: I0e8a4e7cbe1bfc34f03b57256f6eed48f56ccdcc
2019-08-19 08:26:30 -07:00
Leland Miller
6ef5b6c183
Merge "Fix incorrect descriptions under SMS contract"
...
am: 8f48cb7e7e
Change-Id: I9b8659b91e72608100efbba3d36cb0b86066feb3
2019-08-19 08:02:38 -07:00
Treehugger Robot
8f48cb7e7e
Merge "Fix incorrect descriptions under SMS contract"
2019-08-19 14:22:21 +00:00
James.cf Lin
8f05cb6f19
Remove the Phone registration error notification
...
When the Phone registration status changes and back to
service, remove the Phone error notification automatically.
Bug: 136535506
Test: manual
Change-Id: I3ac19c09a37c4f62ddcf64e8660a7e925648f4dd
2019-08-19 10:35:35 +08:00