Commit Graph

7987 Commits

Author SHA1 Message Date
Jordan Liu
88f125c096 Merge "Update getUiccCardsInfo doc"
am: 39fbf96b5a

Change-Id: I2b3af7fb26bfd5e403401daaac37888877bca851
2019-05-01 15:02:42 -07:00
Xiangyu/Malcolm Chen
9cdbb1a981 Merge "Add EuiccManager#EXTRA_PHYSICAL_SLOT_ID to detect it's an operation for pSIM."
am: d3daa7a40e

Change-Id: I8e5d90ed969058b359321aeb6af8492f72d3a2f5
2019-05-01 14:57:16 -07:00
Jordan Liu
39fbf96b5a Merge "Update getUiccCardsInfo doc" 2019-05-01 21:32:46 +00:00
Xiangyu/Malcolm Chen
d3daa7a40e Merge "Add EuiccManager#EXTRA_PHYSICAL_SLOT_ID to detect it's an operation for pSIM." 2019-05-01 20:49:16 +00:00
Holly Jiuyu Sun
255d64e7a6 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-05-01 11:53:06 -07:00
Jordan Liu
eb5c27d469 Update getUiccCardsInfo doc
This method will return info for inactive eUICCs, filtered by carrier
privilege. (Since we can't read carrier privilege on an inactive eUICC,
we always assume that the caller does not have carrier privilege).

Bug: 130826215
Test: manual
Change-Id: Id89fa48f119004b6c18bd21791396bc6c3df2c95
Merged-In: Id89fa48f119004b6c18bd21791396bc6c3df2c95
2019-05-01 10:32:36 -07:00
Pengquan Meng
6f7ccba005 Merge "Fixed the comment of carrier config for CDNR"
am: e994a0d66a

Change-Id: I33dddc12e64b681e23e5600ab4a1c9cf560f795b
2019-04-25 15:18:45 -07:00
Pengquan Meng
b4a53fdb9e Fixed the comment of carrier config for CDNR
Bug: 122921456
Test: build
Merged-In: If5cc8d37ba1e66d59e5bfe9444fe4108f2263be9
Change-Id: If5cc8d37ba1e66d59e5bfe9444fe4108f2263be9
(cherry picked from commit 7ac9a8f314)
2019-04-25 11:23:27 -07:00
Leland Miller
3e2e2d66ce Merge "Use injected instance of RcsControllerCall"
am: f545515ee6

Change-Id: Id364fe89943027eb1ec9f60b7457126ff8945b16
2019-04-24 17:15:18 -07:00
Treehugger Robot
f545515ee6 Merge "Use injected instance of RcsControllerCall" 2019-04-24 23:48:40 +00:00
Jordan Liu
15df31ba43 Merge "Do not populate SLOT_KEY with wrong slot info"
am: b3fded4d17

Change-Id: Idf9900e5201c242651e1491235bdeaced4ec8292
2019-04-24 16:18:34 -07:00
Jordan Liu
b3fded4d17 Merge "Do not populate SLOT_KEY with wrong slot info" 2019-04-24 23:04:25 +00:00
Jordan Liu
dd50042fb8 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
Merged-In: I84bd4c6bc4277e32cee9916dd18dd80948a808a0
2019-04-24 13:50:56 -07:00
SongFerng Wang
a788bd9308 Merge "Add 5G evolution icon"
am: 8442966df9

Change-Id: I9f8d0a708ab5f958c6ceb0ce67cd812298db415b
2019-04-24 09:54:21 -07:00
SongFerngWang
f07d64bdc9 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
2019-04-24 23:03:29 +08:00
Leland Miller
728f0e4927 Merge "Create new RcsMessageQueryResultParcelable"
am: 6af6e3a4f6

Change-Id: Id86442efa84f9c2ed49dc362f4a17466851dacfe
2019-04-23 23:30:26 -07:00
Treehugger Robot
6af6e3a4f6 Merge "Create new RcsMessageQueryResultParcelable" 2019-04-24 06:12:47 +00:00
Tyler Gunn
d60707b4ea Merge "Update API docs for country ISO APIs."
am: 990053e552

Change-Id: Id27a49ca6f817be0c7b358e0cce562ee17dfff69
2019-04-23 14:49:19 -07:00
Tyler Gunn
990053e552 Merge "Update API docs for country ISO APIs." 2019-04-23 21:40:12 +00:00
Pengquan Meng
9bc0b85dae Merge "Add carrier display name related CarrierConfig"
am: 570f5dcae1

Change-Id: I8162117716296d3e707a192e4b61dc5fb3727fee
2019-04-23 13:39:26 -07:00
Pengquan Meng
570f5dcae1 Merge "Add carrier display name related CarrierConfig" 2019-04-23 20:23:20 +00:00
Tyler Gunn
2fc81693c0 Update API docs for country ISO APIs.
Updating to make it more clear the format of the returned country ISO
codes.

Test: Build
Fixes: 131154060
Change-Id: I10c00c1a48e36e00720f50e85d6bb931756f1085
2019-04-23 08:55:56 -07:00
sqian
c85174ba3d Merge "Fix urn compare in EmergencyNumber"
am: 1f55cbf416

Change-Id: I722e0b9093a569aa609ed9b239dc517442e74a2f
2019-04-22 18:39:09 -07:00
Pengquan Meng
0806c2fa77 Add carrier display name related CarrierConfig
Bug: 122921456
Test: build
Merged-In: I79836b2912be5223a2269e660bfaadf4aa72b930
Change-Id: I79836b2912be5223a2269e660bfaadf4aa72b930
(cherry picked from commit 4ae672f192c009c5e0ae629d1c4e321d9677169b)
2019-04-22 17:46:08 -07:00
sqian
3b35404279 Fix urn compare in EmergencyNumber
Test: Sanity
Bug: 130979270
Change-Id: I585ecafcf9996e24befec2dbe86465a1d5a0f030
2019-04-22 11:14:09 -07:00
Jack Yu
3411b38c81 Merge "Return copies for get methods"
am: 0c9a514c20

Change-Id: Ic082bc01fc23b902b6412f6e242759c25662146a
2019-04-19 14:26:46 -07:00
Jack Yu
b79342f288 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

Merged-In: I51662a92b0b6189a8c8aa017085affedac417190
Change-Id: I51662a92b0b6189a8c8aa017085affedac417190
(cherry picked from commit 37538594e6)
2019-04-19 10:29:01 -07:00
Xiangyu/Malcolm Chen
386d538f9d Merge changes from topic "128616035"
am: dc4d14b37a

Change-Id: I0f9807127cdd46079a969532bdeb121bf544921d
2019-04-19 10:14:32 -07:00
Malcolm Chen
4d6ff22849 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
Merged-In: Icd520c3094dd761a13435fae79b7b6b3ba2ebda9
2019-04-19 01:23:39 -07:00
Malcolm Chen
7611d69c75 Add API to set alwaysAllowMms
Add API in SubscriptionManager setAlwaysAllowMmsData
and isMmsDataAllowed.

Bug: 128616035
Test: unittest
Change-Id: Ie56c2d0619a68b188c35e8e24db6c2012d22538b
Merged-In: Ie56c2d0619a68b188c35e8e24db6c2012d22538b
2019-04-18 19:55:33 -07:00
Brad Ebinger
247ecd6f7b Merge "Reorder ImsFeature initialization to handle STATE_READY"
am: 3876ca9d81

Change-Id: Ib0b4a3711af362a0d535ebaa804e57c7a84f6b2d
2019-04-18 13:40:30 -07:00
Brad Ebinger
3876ca9d81 Merge "Reorder ImsFeature initialization to handle STATE_READY" 2019-04-18 20:18:16 +00:00
Hall Liu
cb779131e5 Merge "Change ServiceState and TelephonyRegistry logging"
am: 7aa9020feb

Change-Id: Iae49c001986cb0e4ee6887f249d0f9eb2ab1225f
2019-04-18 11:49:13 -07:00
Hall Liu
7aa9020feb Merge "Change ServiceState and TelephonyRegistry logging" 2019-04-18 18:22:12 +00:00
Leland Miller
a3d9f76b05 Use injected instance of RcsControllerCall
Instead of static methods, create an instance of RcsControllerCall that
holds a reference to the Context and inject it where it is used.

This will be used in a follow up commit that will require the calling
package name be passed when calling IRcs methods.

This change will allow passing a calling package name to an
RcsServiceCall or an RcsServiceCallWithNoReturn, so uses of the call
method might look something like:

```
mRcsControllerCall.call((iRcs, callingPackage) ->
        iRcs.getFileTransferContentUri(mId, callingPackage));
```

Alternatives to storing the context here would have been:

1. To store the context everywhere the RcsControllerCall is injected and
   get the calling package name at each RcsControllerCall call

2. To store the calling package name everywhere that the
   RcsControllerCall instance is injected

Compared to solution 1, the implemented solution avoids repeating the
logic of retrieving the calling package.

Compared to solution 2, the implemented solution does not introduce any
complexity. In addition, the individual classes do not care about the
calling package name outside of the need to pass it to an IRcs method.
In the future, the implemented solution may also provide a useful point
to provide logic involving calls and the context (or other injected
dependencies). Though this future concern is not alone enough to justify
the solution, since the solution adds no additional complexity against
other solutions, it seems like a nice benefit.

Note, to avoid polluting this commit, a follow-up issue (b/128029441)
has been created to adjust the name of RcsControllerCall to reflect that
an instance of RcsControllerCall does not represent a single call to
RcsController.

Bug: 123699565
Test: Existing tests pass
Change-Id: Ib0f55f14397e5eb1e5a55864094c0be0c4e37c06
2019-04-17 16:28:35 -07:00
Brad Ebinger
032fb54fae Merge "Modify docs to reflect operational changes in overrideConfig"
am: 2d5af940ae

Change-Id: I25aa7cf91e8f515be7a3124f238781d57b5ee23d
2019-04-17 14:33:52 -07:00
Hall Liu
83eaad1055 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 13:36:44 -07:00
Brad Ebinger
2d5af940ae Merge "Modify docs to reflect operational changes in overrideConfig" 2019-04-17 20:25:32 +00:00
Brad Ebinger
649475ac0a 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
Merged-In: I562246c1995365308d26f44683f75bf5c46b7405
Change-Id: Ib3ca59eeeda89c0989cfd767257a6a598a97a670
2019-04-17 20:20:42 +00:00
Leland Miller
35d29333f1 Create new RcsMessageQueryResultParcelable
This parcelable class now backes RcsMessageQueryResult. This change will
allow injection of API layer dependencies into RcsMessageQueryResult.

Change-Id: I4bb58413a814a51f4e79490e740f51cc92bb1073
Test: Existing tests pass
Bug: 123699565
2019-04-16 15:33:05 -07:00
Brad Ebinger
d4c5fdf4f9 Merge "Move deprecated IMS_SERVICE_UP/DOWN intents to Phone process"
am: bc17e4b328

Change-Id: I02b96bc07a8b81775ce0b719a38a6dbb68d13ad9
2019-04-16 14:09:33 -07:00
Brad Ebinger
f4efaf0c5a Merge "Clarify ImsMmTelManager#setRttCapabilitySetting docs"
am: 2c0e192436

Change-Id: Ie39a49624ce8e4505153fd814d1926ed1089f9b8
2019-04-16 14:04:10 -07:00
Brad Ebinger
bc17e4b328 Merge "Move deprecated IMS_SERVICE_UP/DOWN intents to Phone process" 2019-04-16 20:56:12 +00:00
Brad Ebinger
65a95070f4 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
Merged-In: I06d7a8c6a43a596042cb74e3e9b88a2d9e61bed6
Change-Id: Ie844053aac9c067e66d03c02cf2b87134ee91065
2019-04-16 20:55:03 +00:00
Brad Ebinger
2c0e192436 Merge "Clarify ImsMmTelManager#setRttCapabilitySetting docs" 2019-04-16 20:51:15 +00:00
Brad Ebinger
a298e67677 Modify docs to reflect operational changes in overrideConfig
Bug: 130372397
Test: Manual
Change-Id: I8958cb04d734ddd3dc8a9b5812dca265c008225b
2019-04-16 13:47:46 -07:00
Brad Ebinger
fa48aa5089 Clarify ImsMmTelManager#setRttCapabilitySetting docs
Bug: 130181297
Test: none - docs change
Change-Id: Ied012ce428051b080da7b5e740caee2a956fa8c3
2019-04-15 17:43:45 -07:00
Xiangyu/Malcolm Chen
7aacd1081d Merge "Add comments in grouping APIs to clarify possible exceptions."
am: 42adca41b9

Change-Id: I6dd991c9e77cdaa8a295e31d382086327d168b21
2019-04-15 17:13:31 -07:00
Xiangyu/Malcolm Chen
42adca41b9 Merge "Add comments in grouping APIs to clarify possible exceptions." 2019-04-15 23:47:41 +00:00
Hall Liu
dc86ce9ae5 Merge "Add EHPLMN and HPLMN to SubscriptionInfo"
am: 4d6ce5406a

Change-Id: I0713d5321bb7baf2a7e35cef9fbec0ae85790711
2019-04-15 16:39:25 -07:00