Commit Graph

6193 Commits

Author SHA1 Message Date
SongFerngWang
2d178eaabb Add 5G evolution icon
This add the 5GE icon to the system UI for specific carriers
LTE CA network.

Bug: 124768697
Test: build & manually test:
fake the operator name with pattern, and check the status bar data icon.

Change-Id: Ife0401219138c7ed22e7bfbd4d5e8648c54a98a8
2019-04-09 08:06:43 +08:00
Nathan Harold
2ecdcb6f21 Revert a bad merge from ag/6938423
Bug: 130174575
Test: none
Change-Id: I7684f9e06f4d226010448e5520965a8733c43073
Merged-In: I7684f9e06f4d226010448e5520965a8733c43073
(cherry picked from commit 12f75864a2)
2019-04-08 21:07:23 +00:00
Nathan Harold
248230983c Merge "Opportunistic Sub Grouping Keys in CarrierConfig" am: 6a9faeee7e
am: 03c007dcde

Change-Id: I3c1584e7b9d387b90f3b585ac93821674c260393
2019-04-08 10:55:15 -07:00
Jack Yu
12ae30d843 Merge "Fixed incorrect service state populated" into qt-dev
am: 9f0eb916f3

Change-Id: Ieb6b57e801061463c70d4b2ccdbfe7ff2dae2f5e
2019-04-08 03:24:17 -07:00
TreeHugger Robot
9f0eb916f3 Merge "Fixed incorrect service state populated" into qt-dev 2019-04-08 10:09:27 +00:00
Jack Yu
9302618da6 Fixed incorrect service state populated
ServiceState.setStateOutOfService does not correctly
clean up the information so the old WLAN registration info
got populated for the next time use.

Bug: 130048577
Test: Telephony sanity tests
Change-Id: I7fab7090c22390914af024c44bffd643c13f33e5
2019-04-08 01:10:27 -07:00
Xiangyu/Malcolm Chen
ecbaebd431 Merge "Opportunistic Sub Grouping Keys in CarrierConfig" into qt-dev
am: 8cadcf07fa

Change-Id: Ice3d73cbba1382219932125a7e7f677c19fdc7b6
2019-04-05 20:09:45 -07:00
Nathan Harold
03c007dcde Merge "Opportunistic Sub Grouping Keys in CarrierConfig"
am: 6a9faeee7e

Change-Id: I1af012ee349645ce36db2462b217e0a52855f577
2019-04-05 13:17:47 -07:00
Nathan Harold
773b0824ee Opportunistic Sub Grouping Keys in CarrierConfig
Add two keys to allow new subscriptions to be added
into subscription groups before carrier config changes
are broadcast.

Bug: 123721160
Test: atest SubscriptionInfoUpdaterTest
Merged-In: Ib6f811b70e41eba897b9bde0c0aeb0c880169f66
Change-Id: Ib6f811b70e41eba897b9bde0c0aeb0c880169f66
(cherry picked from commit c24e219fc1)
2019-04-05 12:47:07 -07:00
Nathan Harold
6a9faeee7e Merge "Opportunistic Sub Grouping Keys in CarrierConfig" 2019-04-05 18:47:37 +00:00
Jack Yu
199ba53534 Merge "Improved the debug message" into qt-dev
am: f7d42f12b8

Change-Id: I04a9f28eb70918bb60f2d487fe1051dc2c714159
2019-04-04 20:39:25 -07:00
Jack Yu
0c92c23951 Improved the debug message
Improved the log readability by printed out data state
in string format instead of integer. Also added listen
local log.

Bug: 129631771
Test: Manual
Change-Id: If786d51b35380f606bc388e29a441bb24a2792e0
2019-04-05 03:17:05 +00:00
Tyler Gunn
efed414b33 Merge "Add @hide API to get the phone account handle for a subId." am: f910aa4e60
am: f31c79bef4

Change-Id: I1c71f82b94c15b61e1aac0c8f84703b80ef3c412
2019-04-04 18:06:17 -07:00
Tyler Gunn
f31c79bef4 Merge "Add @hide API to get the phone account handle for a subId."
am: f910aa4e60

Change-Id: Ib7e13db1f586b9032082683ebae083b3b68ae11e
2019-04-04 11:34:35 -07:00
Tyler Gunn
f910aa4e60 Merge "Add @hide API to get the phone account handle for a subId." 2019-04-04 18:26:29 +00:00
Cody Kesting
7620e8985a Merge "Clarify documentation for TelMan#iccOpenLogicalChannel." am: 4d71a57887
am: c7ca13334b

Change-Id: I712217a06052a541cd0a658f7929ff203a5b9c14
2019-04-04 01:15:02 -07:00
Tyler Gunn
c0340aa16a Add @hide API to get the phone account handle for a subId.
This is used in SubscriptionManager to figure out which phone account
is being updated when the default voice sub changes.  It seemed like
a good spot to put it since we should really have an api for this in
the future.

Test: Manual, manual, manual
Bug: 128916238
Change-Id: If5137c0e7f01a14810e0ee94e5d857d69f368a87
2019-04-03 20:18:01 -07:00
Nathan Harold
c24e219fc1 Opportunistic Sub Grouping Keys in CarrierConfig
Add two keys to allow new subscriptions to be added
into subscription groups before carrier config changes
are broadcast.

Bug: 123721160
Test: atest SubscriptionInfoUpdaterTest
Change-Id: Ib6f811b70e41eba897b9bde0c0aeb0c880169f66
2019-04-03 19:13:52 -07:00
Cody Kesting
c7ca13334b Merge "Clarify documentation for TelMan#iccOpenLogicalChannel."
am: 4d71a57887

Change-Id: I89b28e0297aea91443d7c40df1f99f646ee7b237
2019-04-03 17:59:43 -07:00
Jack Yu
279a924fdf Merge "Removed data and voice RAT from service state"
am: ced4a31769

Change-Id: I2ef8a5d4647d404d5b782e78c8ab2613f6466f92
2019-04-03 17:13:45 -07:00
Cody Kesting
4d71a57887 Merge "Clarify documentation for TelMan#iccOpenLogicalChannel." 2019-04-04 00:01:06 +00:00
Jack Yu
ced4a31769 Merge "Removed data and voice RAT from service state" 2019-04-03 23:39:24 +00:00
Xiangyu/Malcolm Chen
2cadf8e9f9 Merge "Clean up a few names of Telephony intent extra."
am: 63bf486921

Change-Id: If08d387b21a4e4cb71e7026ca781a472db51e2d1
2019-04-03 16:24:23 -07:00
Xiangyu/Malcolm Chen
63bf486921 Merge "Clean up a few names of Telephony intent extra." 2019-04-03 23:06:47 +00:00
Shuo Qian
4362b01d2c Merge "Modify the deprecation of PhoneNumberUtil isEmergencyNumber"
am: b8c7afacec

Change-Id: I5a41e63ee113447f75178bf3bfd996431046799a
2019-04-03 16:04:48 -07:00
Jack Yu
138e2af543 Removed data and voice RAT from service state
The voice and data RAT are now derived from
CS and PS network registration info.

Test: Manual + unit tests
Bug: 129863444

Merged-In: I3f4cb6057a4ae821363099583eeac7c867147afb
Change-Id: I3f4cb6057a4ae821363099583eeac7c867147afb
(cherry picked from commit 5ff5ab5649)
2019-04-03 15:26:21 -07:00
Chen Xu
1ec46998a0 Merge "SDK API doesSwitchModemConfigTriggerReboot" 2019-04-03 22:17:47 +00:00
Jack Yu
1a07f6411b Merge "Removed data and voice RAT from service state" 2019-04-03 22:02:30 +00:00
sqian
9371193264 Modify the deprecation of PhoneNumberUtil isEmergencyNumber
1) Telephony API is still called by a bunch of Util methods in Android that
don't have context, therefore the service can be null. Throwing an
 exception can cause crash.
2) Fix the usage of isEmergencyNumber and isPotentialEmergencyNumber.

Test: Manual
Fixes: 129721537
Change-Id: If82bfc5102a9ac1d7e07ff744c0775a1dc95ba2c
Merged-In: If82bfc5102a9ac1d7e07ff744c0775a1dc95ba2c
(cherry picked from commit c6d55453ee)
2019-04-03 21:32:28 +00:00
Jiuyu Sun
38d786f082 Merge "Check cardId in EuiccManager#isEnabled." 2019-04-03 21:24:45 +00:00
Shuo Qian
4a2b4a2339 Merge "Modify the deprecation of PhoneNumberUtil isEmergencyNumber" 2019-04-03 21:23:44 +00:00
sqian
c6d55453ee Modify the deprecation of PhoneNumberUtil isEmergencyNumber
1) Telephony API is still called by a bunch of Util methods in Android that
don't have context, therefore the service can be null. Throwing an
 exception can cause crash.
2) Fix the usage of isEmergencyNumber and isPotentialEmergencyNumber.

Test: Manual
Fixes: 129721537
Change-Id: If82bfc5102a9ac1d7e07ff744c0775a1dc95ba2c
2019-04-03 12:55:18 -07:00
Jack Yu
5ff5ab5649 Removed data and voice RAT from service state
The voice and data RAT are now derived from
CS and PS network registration info.

Test: Manual + unit tests
Bug: 129863444

Change-Id: I3f4cb6057a4ae821363099583eeac7c867147afb
2019-04-03 12:15:18 -07:00
Cody Kesting
2680416a67 Clarify documentation for TelMan#iccOpenLogicalChannel.
TelephonyManager#iccOpenLogicalChannel documentation should be improved
to clarify the function and its inputs. Relevant standards are also
explicitly referenced.

Bug: 129555815
Test: Only documentation is changed. Tests not affected.
Change-Id: I0664572c83cde480a9ac5f39d8664723b9ac81c9
2019-04-03 10:39:55 -07:00
chen xu
c320f2cb37 SDK API doesSwitchModemConfigTriggerReboot
Bug: 129424775
Change-Id: If03e376ad0e91ad69f8444567700ed3fe76d66f6
2019-04-03 10:21:33 -07:00
Ecco Park
331411f945 Merge "carrier-config: define imsi_eap_identity_sequence_int key" 2019-04-03 12:56:05 +00:00
Jack Yu
0ff26b78d2 Merge changes from topics "lte_ca_support", "ss_provider"
am: 8dedf2b5e4

Change-Id: I3cb0bad3aa3c6b24b79709c507739baab670c044
2019-04-02 20:33:21 -07:00
Jack Yu
ec99892919 Passing ServiceState as byte array into ServiceStateProvider
am: 2d9b4faedc

Change-Id: I26dffc5c5c819a93c04cc64763d49e920f20cb01
2019-04-02 20:24:53 -07:00
Jack Yu
8dedf2b5e4 Merge changes from topics "lte_ca_support", "ss_provider"
* changes:
  Correctly support LTE carrier aggregation
  Passing ServiceState as byte array into ServiceStateProvider
2019-04-03 02:47:20 +00:00
Malcolm Chen
7619445d61 Clean up a few names of Telephony intent extra.
Bug: 128645056
Test: build
Change-Id: Iaf004d6881964bd19072e9ef623f2e89f2529639
Merged-In: Iaf004d6881964bd19072e9ef623f2e89f2529639
2019-04-02 19:15:11 -07:00
Brad Ebinger
3a3e3bc4a8 Merge "Change UT to disabled by default" am: 3c1a889a9c am: 94c06c609a
am: 5e6235db9a

Change-Id: Icd039f27190c07e74a046e0b9f7a9b447346ab8f
2019-04-02 19:06:26 -07:00
Brad Ebinger
5e6235db9a Merge "Change UT to disabled by default" am: 3c1a889a9c
am: 94c06c609a

Change-Id: I930b6873fcc24aebcf430f356bc1002db665ce5d
2019-04-02 18:39:55 -07:00
Brad Ebinger
94c06c609a Merge "Change UT to disabled by default"
am: 3c1a889a9c

Change-Id: Id0e575b3e17515667371ff626a4423e1cb82b2c0
2019-04-02 18:05:12 -07:00
Holly Jiuyu Sun
e680dc014d Check cardId in EuiccManager#isEnabled.
Bug: 111614811
Test: test Fi activation on phone
Change-Id: I3446cbc8f529fc0305a97edf2ada54389652ce55
2019-04-02 17:06:10 -07:00
Treehugger Robot
3c1a889a9c Merge "Change UT to disabled by default" 2019-04-02 23:21:31 +00:00
Xiangyu/Malcolm Chen
d6ecaf064c Merge "Changing default phone capability." 2019-04-02 22:22:33 +00:00
Jack Yu
27ff407104 Correctly support LTE carrier aggregation
NetworkRegistrationInfo.getAccessNetworkTechnology() should
report LTE as the network type when modem reports the RAT
LTE_CA. Fixed by adding a flag in data specific registration
info.

Test: Manual
Bug: 129707180
Merged-In: Ib152f97711441fded998a36528ef007f9e28ccbf
Change-Id: Ib152f97711441fded998a36528ef007f9e28ccbf
(cherry picked from commit 05a6543248)
2019-04-02 14:26:06 -07:00
Jack Yu
2bcdbd1b79 Merge "Correctly support LTE carrier aggregation" 2019-04-02 21:18:04 +00:00
Jack Yu
2d9b4faedc Passing ServiceState as byte array into ServiceStateProvider
This allows the provider to reconstruct the service state
object correctly. Also we can get rid of all the 'set'
methods in ServiceState, which we'd like to remove in the future.

Test: Manual
Bug: 129768354
Merged-In: I835d30e544b3ed49d5d0b6b1ca981a81e3ee2039
Change-Id: I835d30e544b3ed49d5d0b6b1ca981a81e3ee2039
(cherry picked from commit 2e273b2f0f)
2019-04-02 14:02:57 -07:00
Jack Yu
2e273b2f0f Passing ServiceState as byte array into ServiceStateProvider
This allows the provider to reconstruct the service state
object correctly. Also we can get rid of all the 'set'
methods in ServiceState, which we'd like to remove in the future.

Test: Manual
Bug: 129768354
Change-Id: I835d30e544b3ed49d5d0b6b1ca981a81e3ee2039
2019-04-02 11:27:34 -07:00