Commit Graph

6182 Commits

Author SHA1 Message Date
Nathan Harold
fe523ccd8d Improve Range Checks on CellIdentity Classes
Add range checks to ensure that parameters passed
to CellIdentity are within range; if not then set
them to the UNAVAILABLE value.

Bug: 122834811
Test: atest FrameworksTelephonyTests
Merged-In: I0d3699823be60722a1b741efd60b56f23bbc3e86
Change-Id: I0d3699823be60722a1b741efd60b56f23bbc3e86
(cherry picked from commit 251d0a9a99)
2019-04-11 17:38:10 -07:00
TreeHugger Robot
1fbf66bbf4 Merge "Fixed the incorrect function signature" into qt-dev 2019-04-11 00:02:41 +00:00
Jack Yu
5d8f6447a7 Fixed the incorrect function signature
The name source should be an integer instead of long

Test: Manual + unit tests
Bug: 130237749
Change-Id: Ic4447da24073d37401ae0f6e8f8b41bd60d7167d
2019-04-10 14:40:59 -07:00
Cody Kesting
c81d04d675 Update TelMan API for testing Line1NumberForDisplay.
CTS testing is being added for
TelephonyManager#setLine1NumberForDisplay. This requires making the
getter for alphaTag visible for testing with the @TestApi annotation.

Bug: 31963371
Test: API change. tests are unaffected.
Merged-In: I85887cf05f395f4ac4ca8dc6800e29f4fc9f8de4
Change-Id: I85887cf05f395f4ac4ca8dc6800e29f4fc9f8de4
(cherry picked from commit 710cce6dd9)
2019-04-10 09:04:28 -07:00
SongFerng Wang
21df04365d Merge "Add 5G evolution icon" into qt-dev 2019-04-10 03:09:07 +00:00
Nathan Harold
96faca0031 Merge "Update Javadocs for CellInfo Classes" into qt-dev 2019-04-09 21:52:48 +00:00
TreeHugger Robot
5b08bfaaf4 Merge "Allow GSM RSSI levels to be customized by CarrierConfig" into qt-dev 2019-04-09 21:23:37 +00:00
TreeHugger Robot
9bdb2336fc Merge "Make sure APN type ALL does not include types that are not wild cardable" into qt-dev 2019-04-09 20:18:03 +00:00
Nathan Harold
78cf8acf00 Update Javadocs for CellInfo Classes
-Add nullability annotations for getMccString
 and getMncString.
-Add IntRange to CellSignalStrength#getLevel()
-Fix a few docstring errors.

Bug: 129902021
Test: make && make update-api && make offline-sdk-docs
      (no functional change)

Change-Id: I61d645f79a23226ab902fc657fe7b07ffd674a0b
(cherry picked from commit b858d8c682261aae4ab5b99e5c0c99b627b329cb)
2019-04-09 11:25:34 -07:00
Nathan Harold
67bce075e5 Merge changes from topic "tdscdma-rscp" into qt-dev
* changes:
  Fix getLevel for CellSignalStrengthTdscdma
  Rename LevelCalculationMethod Constant
2019-04-09 18:03:31 +00:00
SongFerngWang
3cbcf75c4a 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
Merged-In: Ife0401219138c7ed22e7bfbd4d5e8648c54a98a8
(cherry picked from commit 2d178eaabb)
2019-04-09 17:54:18 +00:00
andychou
186a87b003 Allow GSM RSSI levels to be customized by CarrierConfig
Add carrier config gsm_rssi_thresholds_int_array and mapping level
according to config

BUG: 123528673
Test: build pass and override carrierconfig to test
Change-Id: I61afd1f07564c0df886b0e30d27ea2a059b484dc
Merged-In: I61afd1f07564c0df886b0e30d27ea2a059b484dc
(cherry picked from commit b80dbce9a3)
2019-04-09 17:43:44 +00:00
Xiangyu/Malcolm Chen
f27caf7d58 Merge "Add comments in grouping APIs to clarify possible exceptions." into qt-dev 2019-04-09 17:13:35 +00:00
Malcolm Chen
e00887f612 Add comments in grouping APIs to clarify possible exceptions.
Bug: 127408608
Test: cts, unittest, TelephonyManagerTestApp
Change-Id: I3671e366be7e8c3a75b5ee23b7cf88a33ecd3a4f
2019-04-09 01:22:30 +00:00
Nathan Harold
9772daf398 Fix getLevel for CellSignalStrengthTdscdma
For backwards compatibility (and because it's the
correct choice anyway), getLevel() should
use RSCP as the default signal strength calculation.

-Remove the unused RSSI level constants
-Add RSCP level constants and update the calculation.

Bug: 128369744
Test: atest CellSignalStrengthTdscdmaTest
Merged-In: Ia388a872ee6a0c02b74046aef1f04b0b4cf59130
Change-Id: Ia388a872ee6a0c02b74046aef1f04b0b4cf59130
(cherry picked from commit c2b359a1a7)
2019-04-08 15:45:50 -07:00
Nathan Harold
f1a45c20ef Rename LevelCalculationMethod Constant
Rename sLevelCalculationMethod to use all
caps because it's a constant.

Bug: 8675309
Test: compilation
Merged-In: I4d5ee54c389f912a229bfd2aa7b1daf37f30b803
Change-Id: I4d5ee54c389f912a229bfd2aa7b1daf37f30b803
(cherry picked from commit 3869cd6403)
2019-04-08 15:45:19 -07:00
Amit Mahajan
72ea0fd5a7 Make sure APN type ALL does not include types that are not wild cardable
Test: manual, atest FrameworksTelephonyTests:ApnSettingTest
Bug: 130167974
Change-Id: Ia029df91781ee125078a2b4cc4d0364919c95fd6
2019-04-08 14:18:00 -07:00
Tyler Gunn
beeb456338 Merge "Add @hide API to get the phone account handle for a subId." into qt-dev 2019-04-08 20:44:05 +00: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
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
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
d67bd616e0 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-04 19:08:33 -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
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
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
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
2bcdbd1b79 Merge "Correctly support LTE carrier aggregation" 2019-04-02 21:18:04 +00: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
Jack Yu
05a6543248 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
Change-Id: Ib152f97711441fded998a36528ef007f9e28ccbf
2019-04-02 11:09:43 -07:00
Xiangyu/Malcolm Chen
4e578310f8 Merge "API Feedback for CBRS" am: 9c706654a2
am: f9edc9fffd

Change-Id: I7c449a129ab8bd759b40e0aa0a429dd7847ef755
2019-04-01 19:26:11 -07:00
Xiangyu/Malcolm Chen
f9edc9fffd Merge "API Feedback for CBRS"
am: 9c706654a2

Change-Id: I6a6d0a81100093696fc6e4b66b32e34dbed49913
2019-04-01 19:10:02 -07:00
Xiangyu/Malcolm Chen
9c706654a2 Merge "API Feedback for CBRS" 2019-04-02 01:46:19 +00:00
Hall Liu
516b07ee2c Merge "Add a new carrier config to show the WFC location privacy policy UI" am: 4c508d1b03
am: d94791b712

Change-Id: I435a8b653960e07931bb8c0c11fad3f805431dc6
2019-04-01 17:24:01 -07:00
Hall Liu
d94791b712 Merge "Add a new carrier config to show the WFC location privacy policy UI"
am: 4c508d1b03

Change-Id: I1b3c96de78b909dab372e3e3745c877b8becd2d6
2019-04-01 16:34:30 -07:00
Hall Liu
4c508d1b03 Merge "Add a new carrier config to show the WFC location privacy policy UI" 2019-04-01 22:55:51 +00:00
Malcolm Chen
4674a797e9 API Feedback for CBRS
Bug: 128902411
Test: unittest
Change-Id: I2476834a5048d0e3c2c3413d7168a7a3ad2d7042
Merged-In: I2476834a5048d0e3c2c3413d7168a7a3ad2d7042
2019-04-01 15:23:53 -07:00
Xiangyu/Malcolm Chen
65d4295c3c Merge "Remove clearDefaultsForInactiveSubIds." am: 1e263e7bc0
am: 4e32ac7754

Change-Id: I8c21ba73807837f999bf3fcc7fbef1d24c7500da
2019-04-01 14:31:06 -07:00
Hall Liu
5b4ad4fa6d Allow requestNetworkScan to return sanitized info am: c9d7430685 am: 87217889f1
am: 9e1d425b58

Change-Id: I3fab8c08100a68aba55eefb27b587e73849bc108
2019-04-01 14:29:04 -07:00
Hall Liu
9e1d425b58 Allow requestNetworkScan to return sanitized info am: c9d7430685
am: 87217889f1

Change-Id: I601304e6eaedef27a2adc413084e6a240a5e9b97
2019-04-01 14:08:39 -07:00