Commit Graph

6420 Commits

Author SHA1 Message Date
Pengquan Meng
7ac9a8f314 Fixed the comment of carrier config for CDNR
Bug: 122921456
Test: build
Change-Id: If5cc8d37ba1e66d59e5bfe9444fe4108f2263be9
2019-04-23 21:13:10 +00:00
Jordan Liu
656f6f8b66 Do not populate SLOT_KEY with wrong slot info
The slotId is not necessarily the phoneId, so do not broadcast as if it
is. SLOT_KEY is a hidden extra so this should not impact apps in general
(if they need the old extra they can still use the hidden PHONE_KEY).

For select broadcasts like SIM_CARD_STATE_CHANGED, we will manually
populate the slot key. This is a temporary solution to b/130664115 and
we should eventually review and consider making the SLOT_KEY public for
some broadcasts.

Bug: 130664115
Test: manual
Change-Id: I84bd4c6bc4277e32cee9916dd18dd80948a808a0
(cherry picked from commit 21c3aeb49d)
2019-04-23 18:15:14 +00:00
Shuo Qian
8fb57ca86c Merge "Fix urn compare in EmergencyNumber" into qt-dev 2019-04-23 17:27:26 +00:00
TreeHugger Robot
33ff97d7f6 Merge "Move some telephony methods to max-sdk-p list." into qt-dev 2019-04-23 08:58:36 +00:00
sqian
f2f51a8085 Fix urn compare in EmergencyNumber
Test: Sanity
Bug: 130979270
Change-Id: I585ecafcf9996e24befec2dbe86465a1d5a0f030
Merged-In: I585ecafcf9996e24befec2dbe86465a1d5a0f030
(cherry picked from commit 3b35404279)
2019-04-22 18:32:50 -07:00
Pengquan Meng
057b94f43b Add carrier display name related CarrierConfig
Bug: 122921456
Test: build
Change-Id: I79836b2912be5223a2269e660bfaadf4aa72b930
2019-04-23 00:08:02 +00:00
Hai Zhang
890a980d14 Merge "Add more documentation for isEmergencyAssistanceEnabled()." into qt-dev 2019-04-20 04:56:25 +00:00
Xiangyu/Malcolm Chen
7deafd415b Merge "Adding @hide API to return whether an APN is metered or not." into qt-dev 2019-04-19 02:18:45 +00:00
Malcolm Chen
9562a92874 Adding @hide API to return whether an APN is metered or not.
In addition, make isMmsDataEnabled more generic:
isDataEnabledForApn

Bug: 128616035
Test: manual
Change-Id: Icd520c3094dd761a13435fae79b7b6b3ba2ebda9
2019-04-18 16:40:39 -07:00
Brad Ebinger
ed12eb24a2 Merge "Modify docs to reflect operational changes in overrideConfig" into qt-dev 2019-04-18 21:39:33 +00:00
Brad Ebinger
134ff877e7 Modify docs to reflect operational changes in overrideConfig
Bug: 130372397
Test: Manual
Merged-In: Iff2a6e2cf867ab2e8677ac67f31d87e0365ec9fa
Change-Id: Iff2a6e2cf867ab2e8677ac67f31d87e0365ec9fa
(cherry picked from commit ddad44d41a)
2019-04-18 20:12:00 +00:00
Hall Liu
5942835126 Merge "Change ServiceState and TelephonyRegistry logging" into qt-dev 2019-04-18 18:24:53 +00:00
Jiuyu Sun
45f8da984b Merge "Add EuiccManager#EXTRA_PHYSICAL_SLOT_ID to detect it's an operation for pSIM." into qt-dev 2019-04-18 17:05:18 +00:00
Jack Yu
b5fa3532db Merge "Return copies for get methods" into qt-dev 2019-04-18 12:42:12 +00:00
Hall Liu
879024a03b Change ServiceState and TelephonyRegistry logging
When an app bypasses a location access check due to its target SDK for
queries to ServiceState or when we're pushing out info through
TelephonyRegistry, log it as info instead of error to avoid spamming the
logs too much.

Fixes: 130668054
Test: manual
Change-Id: Ia490f2de2f0b5d326e5290e166e6f97b25e6e187
2019-04-17 15:54:23 -07:00
Holly Jiuyu Sun
aed2152839 Add EuiccManager#EXTRA_PHYSICAL_SLOT_ID to detect it's an operation for pSIM.
Platform needs to pass LPA the pSIM slotId so that LPA knows it's a
toggle action on pSIM.

Bug: 123945155
Test: build
Change-Id: Ie0db50e8ade4c6ce385ebfbfe7cf9e2982d67e34
Merged-In: Ie0db50e8ade4c6ce385ebfbfe7cf9e2982d67e34
2019-04-17 21:01:07 +00:00
Nathan Harold
29ddcbf1a7 Merge "Improve Range Checks on CellIdentity Classes" into qt-dev 2019-04-17 18:40:07 +00:00
Brad Ebinger
1def0b7d7d Merge "Merge "Clarify ImsMmTelManager#setRttCapabilitySetting docs" am: 2c0e192436 am: f4efaf0c5a" into qt-dev 2019-04-17 18:15:13 +00:00
TreeHugger Robot
7269961ae3 Merge "Annotate Part Uri as @NonNull" into qt-dev 2019-04-17 18:10:39 +00:00
Brad Ebinger
af6f933993 Merge "Reorder ImsFeature initialization to handle STATE_READY" into qt-dev 2019-04-17 17:59:16 +00:00
Xiangyu/Malcolm Chen
f447240a0c Merge "Add API to set alwaysAllowMms" into qt-dev 2019-04-17 17:14:55 +00:00
Hai Zhang
62abb5a4eb Add more documentation for isEmergencyAssistanceEnabled().
Bug: 130351486
Test: build
Change-Id: I9dfc0939e12b6e7349c2a1222ff5e7999003a39f
2019-04-17 13:21:44 +08:00
Jack Yu
37538594e6 Return copies for get methods
NetworkRegistrationInfo and ServiceState are not
immutable class. Their get methods should return a new
copy of object so the caller won't modify its state.

Bug: 130538118
Test: Unit tests + manual
Change-Id: I51662a92b0b6189a8c8aa017085affedac417190
2019-04-16 17:17:03 -07:00
Brad Ebinger
a24960f3fd Merge "Clarify ImsMmTelManager#setRttCapabilitySetting docs" am: 2c0e192436
am: f4efaf0c5a

Bug: 130181297
Test: none - docs change
Merged-In: I3a768979c48c90360046aa0d130b378073524452
Change-Id: I3a768979c48c90360046aa0d130b378073524452
(cherry picked from commit 56b96fe065)
2019-04-16 22:27:01 +00:00
Brad Ebinger
5226c68546 Reorder ImsFeature initialization to handle STATE_READY
The method ImsFeature#setFeatureState can not be called
in the constructor of MmTelFeature currently, because the
IMS_SERVICE_UP intent will not be sent until mContext != null.

Remove this dependency and ensure addImsFeatureStatusCallback
is called after ImsFeature#initialize.

Bug: 130569556
Test: atest GtsTelephonyTestCases; atest FrameworksTelephonyTests
Change-Id: Ib3ca59eeeda89c0989cfd767257a6a598a97a670
2019-04-16 18:22:21 +00:00
Brad Ebinger
b47bcf0ee5 Merge "Move deprecated IMS_SERVICE_UP/DOWN intents to Phone process" into qt-dev 2019-04-16 17:36:05 +00:00
Malcolm Chen
8402ba5593 Add API to set alwaysAllowMms
Add API in SubscriptionManager setAlwaysAllowMmsData
and isMmsDataAllowed.

Bug: 128616035
Test: unittest
Change-Id: Ie56c2d0619a68b188c35e8e24db6c2012d22538b
2019-04-15 17:03:21 -07:00
Leland Miller
7a29ca696e Annotate Part Uri as @NonNull
This is in response to automated API feedback.

Change-Id: I6f3c7675dc09bdca6bc30e1b7a8718e46f6ff4b4
Fix: 126699938
Test: Build and existing tests pass
2019-04-15 16:17:20 -07:00
Hall Liu
75319d28ad Add EHPLMN and HPLMN to SubscriptionInfo
Add EHPLMN and HPLMN fields to SubscriptionInfo. These fields are read
from the ICC card.

Bug: 130253962
Test: manual
Change-Id: If98c57c14e39b917a5e7e8bbc59c2170989b63a7
2019-04-15 15:43:30 -07:00
Brad Ebinger
55c4eb197f Move deprecated IMS_SERVICE_UP/DOWN intents to Phone process
The ImsService was sending the deprecated IMS intents, which
should only be send using the Phone process. This was causing
GTS failures.

Bug: 130569556
Test: atest FrameworksTelephonyTests; atest GtsTelephonyTestCases
Change-Id: Ie844053aac9c067e66d03c02cf2b87134ee91065
2019-04-15 22:20:34 +00:00
Shuo Qian
bb2d26cb87 Merge "Fix Emergency Number API doc" into qt-dev 2019-04-15 21:39:02 +00:00
Nathan Harold
078d4d1475 Merge "Remove key_ prefix from CarrierConfig Strings" into qt-dev 2019-04-15 18:51:37 +00:00
Calvin Pan
c6a1bf1ac1 Merge "Add NonNull in Carriers constant" into qt-dev 2019-04-15 17:33:37 +00:00
Mathew Inwood
064e02ab0d Move some telephony methods to max-sdk-p list.
They were added to the max-sdk-o in commit f23153f (in Q), but should have
been added to max-sdk-p as they were on the light greylist in P.

This is a cherry-pick of 092a0a2 from aosp-master.

Test: m
Bug: 124354830
Change-Id: I856b975b88bdc5eacc5e061ba196bd584ca78c73
2019-04-15 16:11:33 +01:00
sqian
aca6eb7dac Fix Emergency Number API doc
1) remove documentation about null return
2) Map including the key*s* as the active subscription ID*s*

Bug: 130426238
Test: Treehugger
Change-Id: I4c9b682ef25378b9de91cd6255ed6fc514ea220d
2019-04-12 16:35:13 -07:00
Nathan Harold
cd4f7b53a2 Remove key_ prefix from CarrierConfig Strings
Remove the key_ prefix from the resolved string
of:
KEY_SUBSCRIPTION_GROUP_UUID_STRING; and
KEY_IS_OPPORTUNISTIC_SUBSCRIPTION_BOOL

Bug: 130374824
Test: compilation (trivial string change)
Merged-In: I1ae1df9d33229d3f3aba237d865ceb2373761af4
Change-Id: I1ae1df9d33229d3f3aba237d865ceb2373761af4
(cherry picked from commit bbb8968e54)
2019-04-12 15:12:34 -07:00
calvinpan
ef7b99adae Add NonNull in Carriers constant
Add NonNull in Carriers constant

Bug: 126699334
Test: build pass
Change-Id: I1cc3db5a4bb778e1693ebfff37dca6e136251f1b
2019-04-12 10:51:22 +00:00
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
Michele
b65dddd93f Remove @hide from builder of CarrierRestrictionRules
Remove @hide from builder of CarrierRestrictionRules class.

Bug: 124325937
Test: compilation

Change-Id: If05e7d950b6737a6bb92af962816c7cbc36b00d1
Merged-In: If05e7d950b6737a6bb92af962816c7cbc36b00d1
2019-04-11 12:37:40 -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