Commit Graph

7429 Commits

Author SHA1 Message Date
Automerger Merge Worker
2254697a3f Merge "Telephony: do not use hidden API ArrayUtils." am: c6b5fbaf17 am: e8f1598321
Change-Id: Iec49ae0db1aee5614957a32f6d0a8cf5374597d3
2019-12-13 02:26:53 +00:00
Meng Wang
e1df98d2e2 Telephony: do not use hidden API ArrayUtils.
Make a local copy instead.

Bug: 137202333
Test: make
Merged-In: I3218bca2d296c548b9d8427f70df8f7a33d0d449
Change-Id: I3218bca2d296c548b9d8427f70df8f7a33d0d449
2019-12-12 16:52:30 -08:00
Automerger Merge Worker
675c99fbe4 Merge "Add APN type XCAP" am: 7c03a80247 am: d74193446c
Change-Id: Ie74716546ce86dc951e411bff829c1f842cfc51e
2019-12-12 23:39:01 +00:00
Sarah Chin
aefc64b0f2 Change defaults for FREQUENCY_RANGE and NR_STATE
Change value from -1 to 0 to match proto

Bug: 141323073
Test: atest TelephonyMetricsTest
Change-Id: I4509f22cdae656de3ad011de3a1664e27d35986a
Merged-In: I4509f22cdae656de3ad011de3a1664e27d35986a
(cherry picked from commit 65277dfec2)
2019-12-12 23:21:09 +00:00
Sarah Chin
7c03a80247 Merge "Add APN type XCAP" 2019-12-12 22:39:01 +00:00
Sarah Chin
9146586e64 Merge "Change defaults for FREQUENCY_RANGE and NR_STATE" 2019-12-12 22:09:24 +00:00
Sarah Chin
ded54498d3 Change defaults for FREQUENCY_RANGE and NR_STATE
Change value from -1 to 0 to match proto

Bug: 141323073
Test: atest TelephonyMetricsTest
Change-Id: I4509f22cdae656de3ad011de3a1664e27d35986a
Merged-In: I4509f22cdae656de3ad011de3a1664e27d35986a
2019-12-12 12:57:35 -08:00
Sarah Chin
66ebce9a50 Add APN type XCAP
Test: atest ApnSettingTest
Bug: 73792201
Change-Id: I662f743cca3c6b2f919d84cf0570f23a1f6d9791
Merged-In: I662f743cca3c6b2f919d84cf0570f23a1f6d9791
2019-12-12 11:55:47 -08:00
Hall Liu
06fc4257b7 Merge "Add ImsReasonInfo constant for retrying without RTT" 2019-12-12 19:29:37 +00:00
Automerger Merge Worker
5bd2cfe59b Merge "Add CarrierConfig for roaming PLMNS that will need emer DDS switch" am: 7de7f018e8 am: 130286de4e
Change-Id: I767b9a8789a0eff627f4ef6ee811433c6141c807
2019-12-12 02:36:19 +00:00
Hall Liu
07105b44cf Add ImsReasonInfo constant for retrying without RTT
Add CODE_RETRY_ON_IMS_WITHOUT_RTT for the IMS stack to indicate to
Telephony that a call should be retried without RTT enabled.

Bug: 141963475
Test: manual

Change-Id: Ic3aa8856e98d8c34fd98462d71834e69b857eda4
2019-12-11 18:27:25 -08:00
Brad Ebinger
7de7f018e8 Merge "Add CarrierConfig for roaming PLMNS that will need emer DDS switch" 2019-12-12 02:10:10 +00:00
Automerger Merge Worker
85d23aa0b4 Merge "Remove ACTION_PRECISE_DATA_CONNECTION_STATE_CHANGED" am: 6fce89f8b6 am: 3780da605a
Change-Id: I6df8824ca6a5ba668d49e728434cc6d9cacda8a3
2019-12-11 21:56:19 +00:00
Automerger Merge Worker
76baa0bd5d Merge "Remove ACTION_PRECISE_CALL_STATE_CHANGED and its extras." am: 79c83587c3 am: 5a0bfe164d
Change-Id: I5b5deb13c6c934de4626f874410cf4b1333cfb4a
2019-12-11 18:26:28 +00:00
Meng Wang
52a4a79b8c Remove ACTION_PRECISE_DATA_CONNECTION_STATE_CHANGED
and extra keys only used by the intent.

Those hidden constants are only used by TelephonyRegistry, blocking
telephony mainline. Remove them since no one uses the broadcast.

Bug: 140908357
Test: make
Change-Id: I8fffe2996f233f2422173e9823810523ce80f2e5
2019-12-11 10:10:55 -08:00
Meng Wang
79c83587c3 Merge "Remove ACTION_PRECISE_CALL_STATE_CHANGED and its extras." 2019-12-11 17:49:32 +00:00
Daniel Huang
2abcb6be3f Merge "Add more error codes." into qt-qpr1-dev-plus-aosp 2019-12-11 02:31:00 +00:00
Meng Wang
b857ba95e8 Remove ACTION_PRECISE_CALL_STATE_CHANGED and its extras.
Those hidden constants are only used in TelephonyRegistry, blocking
telephony mainline. Remove them since no one uses the broadcast.

Bug: 140908357
Test: make
Change-Id: I2425c157d9d24a8ec18cb66a2ce12c12e0fe49e1
2019-12-10 18:22:10 -08:00
Automerger Merge Worker
5b07e901bf Merge "Fix to handle duplicate call id for conference call" am: e31b09c825 am: 8d54779726
Change-Id: Ia7ce47824a9610e28c7b333e3d6b4e7a73872fa9
2019-12-10 22:57:13 +00:00
Brad Ebinger
f51c917af3 Add CarrierConfig for roaming PLMNS that will need emer DDS switch
When roaming, we assume that the roaming operator will support
control plane fallback for emergency SUPL. For roaming operators
that we know do not support control plane fallback, we must perform
a DDS switch before dialing an emergency number on that operator.

Bug: 144383368
Test: atest TeleServiceTests; manual
Merged-In: I4a033f89610fd409ea81c40230938720ca76541c
Change-Id: I4a033f89610fd409ea81c40230938720ca76541c
2019-12-10 22:47:17 +00:00
Treehugger Robot
e31b09c825 Merge "Fix to handle duplicate call id for conference call" 2019-12-10 22:28:24 +00:00
Automerger Merge Worker
fd536b0cfc Merge "expose datafail cause used in telephony-sdk annotation class" am: 20e05a4660 am: 65f7a4ac6b
Change-Id: Ibfa10b0c9dadceead0137e10508ce40465a2e7fd
2019-12-10 22:10:31 +00:00
Chen Xu
20e05a4660 Merge "expose datafail cause used in telephony-sdk annotation class" 2019-12-10 21:39:35 +00:00
Shuo Qian
6b610ac87f Merge "Integrate Signal Threshold for 5G" am: 8763091019
am: 742e21719a

Change-Id: Ib7e4b8724908743e5551179cd37194fb33678ab8
2019-12-10 10:17:28 -08:00
Shuo Qian
8763091019 Merge "Integrate Signal Threshold for 5G" 2019-12-10 18:03:32 +00:00
Jack Yu
8a1b8baf0f Merge "CarrierConfigManager: Adds API for persistent override of values" am: 9be4d11abb
am: 52d95ed0ed

Change-Id: Ibbf4f327c266194fb74c508ab96ba3d199ca1ac9
2019-12-10 09:49:12 -08:00
Jack Yu
9be4d11abb Merge "CarrierConfigManager: Adds API for persistent override of values" 2019-12-10 17:35:20 +00:00
danielwbhuang
12e0e6d24b Add more error codes.
1.Add error codes for setPreferredOpportunisticDataSubscription and updateAvailableNetworks
2.It's for changing behavior depending on target SDK, so use the compat framework.

Test: run atest.
1.atest TelephonyManagerTest#testPreferredOpportunisticDataSubscription
[1/1] android.telephony.cts.TelephonyManagerTest#testPreferredOpportunisticDataSubscription: PASSED (1.662s)
2.atest TelephonyManagerTest#testUpdateAvailableNetworks
[1/1] android.telephony.cts.TelephonyManagerTest#testUpdateAvailableNetworks: PASSED (534ms)

Bug: 130595455
Merged-In: I6f386bfcf75236e30141fab89e2b62ee3a8cb59e
Change-Id: I6f386bfcf75236e30141fab89e2b62ee3a8cb59e
2019-12-10 16:55:43 +08:00
Torbjorn Eklund
074e97d45e CarrierConfigManager: Adds API for persistent override of values
Adds an API in CarrierConfigManager for persistent override of carrier
config values.

Bug: 144544956
Test: Manual
Merged-In: I50618921d1ec522d5cd0bd71a5f8e0b1877f1ce1
Change-Id: I50618921d1ec522d5cd0bd71a5f8e0b1877f1ce1
2019-12-10 06:51:38 +00:00
Chen Xu
3c963e27b4 expose datafail cause used in telephony-sdk annotation class
1. expose one hidden dataFailCause used in telephony-sdk annotation
class
2. remove unused hidden dataFailCause referened in telephny-sdk
annotation

Bug: 140908357
Test: Build
Change-Id: Ia7ca9a2a354937946ba57017f4bd03fe880aeb6d
2019-12-09 21:18:59 -08:00
Shuo Qian
c1f935e3c0 Integrate Signal Threshold for 5G
1) Introduce default values for 5G Signal thresholds
2) Introduce parameter to control in 5G NR Signal Strength Level
3) Introduce SignalThresholdInfo to support Framework and HAL

Test: Treehugger
Bug: 135717625
Change-Id: I8a716e9fe445349a56bb33b6b8f581febb21552b
Merged-In: I8a716e9fe445349a56bb33b6b8f581febb21552b
(cherry picked from commit 7d7b2f1a44)
2019-12-09 15:24:39 -08:00
Automerger Merge Worker
b016c57ff3 Merge "When SPN is empty, use PNN in mobile network settings" into qt-qpr1-dev am: eae359df70
Change-Id: Ifaa2300cfd755979211847c4c4042c1127d2b708
2019-12-07 03:12:13 +00:00
Jordan Liu
236ae68a79 Merge "Expose some SystemApis and edit framework-cellbroadcast-shared-srcs" am: 9fd7c05eb9
am: 6824b2d6ed

Change-Id: I20361e0eeebebcf0547cb8c153262eb8e4e61ca3
2019-12-06 16:19:46 -08:00
Jordan Liu
9fd7c05eb9 Merge "Expose some SystemApis and edit framework-cellbroadcast-shared-srcs" 2019-12-07 00:06:23 +00:00
Jack Yu
9d95aff922 When SPN is empty, use PNN in mobile network settings
Added one more name source 'PNN', which has priority
higher than carrier id but lower than EF_SPN.

Bug: 143493866
Test: Manual

Change-Id: I2ef14204d0db018e7f67578a57e56fdbea8b698c
2019-12-06 15:28:30 -08:00
Meng Wang
405e5f3c15 Merge "SubscriptionPlan: move out of telephony" am: c4090312df
am: 3172db5841

Change-Id: Id061cab31b2bf810a889abf0f31b39b322f346ae
2019-12-06 15:22:54 -08:00
Treehugger Robot
c4090312df Merge "SubscriptionPlan: move out of telephony" 2019-12-06 23:12:58 +00:00
Shuo Qian
347e67e1a9 Merge "Make getPackagesWithPriviligesForAllActiveSubscriptions system API" am: 0024076b1a
am: bf43ca5c69

Change-Id: I441c7160fe32380d3a4172ccb6924de6faf8d3a3
2019-12-06 14:17:17 -08:00
Shuo Qian
0024076b1a Merge "Make getPackagesWithPriviligesForAllActiveSubscriptions system API" 2019-12-06 22:01:17 +00:00
Meng Wang
088c61aaf4 Merge "SubscriptionPlan: move out of telephony" am: a11df59bb4
am: 968927d7ff

Change-Id: Ia2bf315c236678d34d773e210e95d6d82efa0d32
2019-12-06 13:52:01 -08:00
Meng Wang
1ba2871a02 SubscriptionPlan: move out of telephony
Hidden APIs of SubscriptionPlan are used in system server, not
telephopny. So it makes more sense for SubscriptionPlan to be in
core instead of telephopny.

Bug: 145814152
Test: make
Change-Id: I3bfb0ec699f46b0cc34c3bc2e13bfb242bc295bf
2019-12-06 13:50:15 -08:00
Meng Wang
a11df59bb4 Merge "SubscriptionPlan: move out of telephony" 2019-12-06 21:37:52 +00:00
sqian
22f5749ccc Make getPackagesWithPriviligesForAllActiveSubscriptions system API
Test: build
Bug: 145550382
Change-Id: Ia7efb9e4b22b24f3c87c7cd631548c7254b28926
Merged-In: Ia7efb9e4b22b24f3c87c7cd631548c7254b28926
(cherry picked from commit 6f27c5769d)
2019-12-06 12:07:57 -08:00
Meng Wang
36673a4b44 SubscriptionPlan: move out of telephony
Hidden APIs of SubscriptionPlan are used in system server, not
telephopny. So it makes more sense for SubscriptionPlan to be in
core instead of telephopny.

Bug: 145814152
Test: make
Change-Id: I4c7ae02f9f4f154c99263521e08265d6fb367272
2019-12-06 11:47:46 -08:00
Jordan Liu
bf68dc85a4 Expose some SystemApis and edit framework-cellbroadcast-shared-srcs
The APIs are used in the CellBroadcastService, and the
framework-cellbroadcast-shared-srcs library is also linked there.

Bug: 135956699
Test: manual
Change-Id: I5e71ea1ee1a858c0520c241dc7365733441e0f50
Merged-In: I5e71ea1ee1a858c0520c241dc7365733441e0f50
2019-12-06 11:19:48 -08:00
Meng Wang
d32f3a1db3 Merge "Move SIM_ACTIVATION_TYPE_* to TelephonyRegistryManager" am: 392f3db6b0
am: 484b1b87e0

Change-Id: I681dcc688aa1e66706c99cfa401c8b89cb6367c3
2019-12-05 17:20:49 -08:00
Meng Wang
392f3db6b0 Merge "Move SIM_ACTIVATION_TYPE_* to TelephonyRegistryManager" 2019-12-06 00:32:40 +00:00
Meng Wang
cb7a8f3245 Merge "Move DataConnectionRealTimeInfo from telephony to core." am: 037b717fe8
am: d973a4b22c

Change-Id: Ia2765a05104303e4d15b4f55ca8433759031dacc
2019-12-05 15:55:27 -08:00
Meng Wang
037b717fe8 Merge "Move DataConnectionRealTimeInfo from telephony to core." 2019-12-05 23:43:06 +00:00
Sarah Chin
47eee1eb10 Merge changes from topics "ngran", "update_ngran" am: 226499214c
am: 1cf53ac4c3

Change-Id: If95698b75a660c55acb5ff26db25504bebbee3ec
2019-12-05 13:55:37 -08:00