Commit Graph

11141 Commits

Author SHA1 Message Date
Jack Nudelman
258abf98ce Merge "Call TelephonyProvider apis for backup/restore per-sim settings." into sc-dev 2021-02-05 16:37:04 +00:00
Brad Ebinger
7bf20a9c07 Merge "Discard dead MmTelFeature Binder Instances" am: 9e1009dd55 am: 36199d0322 am: b985f68522
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1575999

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1b22954276763218ba224fdd4239953adc357123
2021-02-05 05:01:56 +00:00
Brad Ebinger
b985f68522 Merge "Discard dead MmTelFeature Binder Instances" am: 9e1009dd55 am: 36199d0322
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1575999

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I376bc488d54805332da88bd138514a9eb8a1784d
2021-02-05 04:35:48 +00:00
Brad Ebinger
9e1009dd55 Merge "Discard dead MmTelFeature Binder Instances" 2021-02-05 03:12:28 +00:00
Sarah Chin
707d05ce93 Merge "Update setSubscriptionOverride API to allow network types" into rvc-qpr-dev-plus-aosp 2021-02-05 03:05:24 +00:00
Calvin Pan
ca389a6427 Merge "Add a carrier config for non-RCS capabilities expiration" am: 454e15dc12 am: 1285ab52ce am: 6362783d8c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1561617

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia0054d3821355ceda57d4df85af704c8bf7433f2
2021-02-05 02:51:35 +00:00
Calvin Pan
6362783d8c Merge "Add a carrier config for non-RCS capabilities expiration" am: 454e15dc12 am: 1285ab52ce
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1561617

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I117abe342c7928f287c7a5f3f947b32e5da6678e
2021-02-05 01:53:21 +00:00
James Lin
e5e204f62b Merge "[RCS UCE] Add a network response with Reason header info callback for the publish request and subscribe request." am: 77c5faf493 am: 09f4410ea2 am: 4472f1f545
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1570560

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5030cd96b091410af130c9916c564b3f296ec230
2021-02-05 01:30:32 +00:00
Calvin Pan
454e15dc12 Merge "Add a carrier config for non-RCS capabilities expiration" 2021-02-05 01:27:59 +00:00
Brad Ebinger
cd910c2131 Discard dead MmTelFeature Binder Instances
When the phone process crashes and the IMS service is in
a separate process, there is a condition where the ImsService may
still stay unbound, but alive and not torn down. In this case,
when the phone process comes back up and tries to register new
binder callbacks, detect that the old binder callbacks are dead
and discard instead of throwing an exception.

Bug: 179217608
Test: kill phone process
Change-Id: I4fc3b6d15fe19ebaf1fc52dab92a615a761222f8
2021-02-05 00:42:39 +00:00
James Lin
4472f1f545 Merge "[RCS UCE] Add a network response with Reason header info callback for the publish request and subscribe request." am: 77c5faf493 am: 09f4410ea2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1570560

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I767ccd1c49323f915b51cfd245eb59d682d52254
2021-02-05 00:24:16 +00:00
James Lin
77c5faf493 Merge "[RCS UCE] Add a network response with Reason header info callback for the publish request and subscribe request." 2021-02-04 23:59:19 +00:00
Sarah Chin
9762f014fa Update setSubscriptionOverride API to allow network types
Allow 5G unmetered override via a different API than
setSubscriptionPlans. OVERRIDE_UNMETERED can be set without defining
SubscriptionPlans, but OVERRIDE_CONGESTED behavior remains the same.
Both the unmetered and congested case of setSubscriptionOverride take in
networkTypes as an additional parameter

Test: atest FrameworksTelephonyTests
Test: atest SubscriptionManagerTest
Bug: 175723642
Change-Id: Ie196db5e236e478f1c29c3dfd1ca31acc205c54b
Merged-In: Ie196db5e236e478f1c29c3dfd1ca31acc205c54b
2021-02-04 13:16:16 -08:00
Jack Nudelman
e2ea428d95 Call TelephonyProvider apis for backup/restore per-sim settings.
Bug: 172244913
Test: make, atest TelephonyProviderTest

Change-Id: I1652172f003e2fd5ab08dfdbf63dadc64e034406
2021-02-04 20:54:39 +00:00
Adrian Roos
d68bee2746 API: Suppress existing NullableCollections lints am: 6a6aa5e23d am: 4da67dd2f6 am: 98eb82a6d3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566096

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I314b97d2677f26b0a9c09a52918df49096450aea
2021-02-04 17:09:38 +00:00
Adrian Roos
98eb82a6d3 API: Suppress existing NullableCollections lints am: 6a6aa5e23d am: 4da67dd2f6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566096

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I931b4ec091173789f480ecc761044a27944c4b85
2021-02-04 16:49:00 +00:00
Adrian Roos
4da67dd2f6 API: Suppress existing NullableCollections lints am: 6a6aa5e23d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566096

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2d47151b7e26e82706f2d94a13c4067fe71fc168
2021-02-04 16:19:34 +00:00
Adrian Roos
60f3d5cee4 Merge changes from topic "nullablecollection"
* changes:
  API: Suppress existing NullableCollections lints (TaskOrganizer)
  API: Suppress existing NullableCollections lints
2021-02-04 15:53:34 +00:00
Brad Ebinger
36ba58f32b Merge "Define FEATURE_TELEPHONY_IMS_SINGLE_REGISTRATION feature" am: 8cb6d95803 am: a30ce7ea41 am: 5bbee4a0bb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564832

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I65ab2d2c40512291e34f64e6ac070fbae4d20475
2021-02-04 01:42:57 +00:00
Brad Ebinger
5bbee4a0bb Merge "Define FEATURE_TELEPHONY_IMS_SINGLE_REGISTRATION feature" am: 8cb6d95803 am: a30ce7ea41
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564832

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If16559974e91b7d231485b8e73416289f629a553
2021-02-04 01:28:37 +00:00
James.cf Lin
440160856e [RCS UCE] Add a network response with Reason header info callback for the publish request and subscribe request.
Bug: 177495626
Test: atest ImsServiceTest RcsUceAdapterTest
Change-Id: I830894bb022947f864a716959489c941f79ce070
2021-02-04 08:49:59 +08:00
Brad Ebinger
8cb6d95803 Merge "Define FEATURE_TELEPHONY_IMS_SINGLE_REGISTRATION feature" 2021-02-04 00:38:15 +00:00
Treehugger Robot
f4ee5731df Merge "NetworkRegistrationInfo: add Parcel recycle" am: 9b899f7253 am: fbfe84846e am: 6d47e1ade5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1569100

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1804f92b9385ae2cf811b09faa24e68715e98880
2021-02-03 20:19:11 +00:00
Treehugger Robot
6d47e1ade5 Merge "NetworkRegistrationInfo: add Parcel recycle" am: 9b899f7253 am: fbfe84846e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1569100

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I09bbf36ee9b527fc610f01e557d44ed5c1d3df1b
2021-02-03 19:55:58 +00:00
Hall Liu
4edcb5272a Merge "Rename setMobileDataPolicyEnabledStatus" into sc-dev 2021-02-03 19:54:14 +00:00
Treehugger Robot
9b899f7253 Merge "NetworkRegistrationInfo: add Parcel recycle" 2021-02-03 18:31:07 +00:00
Sarah Chin
5becb8f399 Merge "Temporary fix to prevent TEMPORARILY_NOT_METERED leak" 2021-02-02 22:58:01 +00:00
Jack Yu
ad5413f724 Temporary fix to prevent TEMPORARILY_NOT_METERED leak
Currently we are seeing TEMPORARILY_NOT_METERED occurs on non-5G
devices. This fix adds more checks to prevent incorrect
TEMPORARILY_NOT_METERED being set. Before we root cause the issue,
we only allow this bit when all of the following conditions met.

1. Devices should support 5G.
2. Carriers should support 5G unmetered data.
3. Device should camp on 5G network.

This temporary fix should be removed after we root cause the issue.

Bug: 176119724
Test: Manual
Change-Id: I2b987d24851cdb16d8457b0ec5c546ace5485ed0
Merged-In: I2b987d24851cdb16d8457b0ec5c546ace5485ed0
2021-02-02 13:44:33 -08:00
Hall Liu
7da0b797ed Rename setMobileDataPolicyEnabledStatus
Rename to setMobileDataPolicyEnabled per API council comments

Fixes: 171804465
Test: atest TelephonyManagerTest
Change-Id: Idff480ce21d1591057c26e6e5474c6ff2ee5297a
2021-02-02 12:34:57 -08:00
Brad Ebinger
72a11d73e7 Merge "Add SIP configration Bundle keys for UA and CNI" am: 5c389e2507 am: d1a4eec020 am: e053159612
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1567734

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I275dd58da64367ebfdde3ee53a32f4067e636af0
2021-02-02 19:35:38 +00:00
Brad Ebinger
e053159612 Merge "Add SIP configration Bundle keys for UA and CNI" am: 5c389e2507 am: d1a4eec020
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1567734

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If4cf04ca73239f84644edb654b6dc937505570ea
2021-02-02 19:05:07 +00:00
Brad Ebinger
5c389e2507 Merge "Add SIP configration Bundle keys for UA and CNI" 2021-02-02 17:53:18 +00:00
calvinpan
39884877dd Add a carrier config for non-RCS capabilities expiration
Bug: 174196620
Test: atest
Change-Id: I280d8e1687feb2d96a20e2d18a7abc62c4a89e25
2021-02-02 03:00:15 +00:00
Steven Moreland
87326e0f88 NetworkRegistrationInfo: add Parcel recycle
~580 hits on cuttlefish boot

Bug: 139327211
Test: boot w/ Parcel.java DEBUG_RECYCLE
Change-Id: I20b7c8865c3ab1f562dfa9f19039f08cef8f0f7d
2021-02-02 02:18:56 +00:00
Brad Ebinger
c28d5844dd Add SIP configration Bundle keys for UA and CNI
Adds IMS SIP configuration bundle keys for User-Agent and
Cellular-Network-Info headers required by some networks.

Bug: 178606181
Test: atest CtsTelephonyTestCases:SipDelegateManagerTest
Change-Id: I389162ca0c6348580f6ee8bb6ce5ee3a4e84595e
2021-02-02 00:53:02 +00:00
Daniel Bright
a9ec691601 Merge "Partial hal support for secondary link bandwidth" am: bed5f6e84d am: 3504c8c759
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1565115

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I95842d0e704aa3ddf0e0f9c19b411fa93a64e402
2021-02-02 00:30:49 +00:00
Daniel Bright
bed5f6e84d Merge "Partial hal support for secondary link bandwidth" 2021-02-01 22:48:44 +00:00
Brad Ebinger
33437bd046 Define FEATURE_TELEPHONY_IMS_SINGLE_REGISTRATION feature
Define a new feature that determines if a device supports IMS
single registration and integrate this feature tag into the
SIP transport and provisioning APIs.

Bug: 149426399
Bug: 173715911
Test: atest CtsTelephonyTestCases FrameworksTelephonyTests
Change-Id: Id9ac6a3a69be2072cf28136e98408118b7d9f07f
2021-02-01 21:27:41 +00:00
Adrian Roos
6a6aa5e23d API: Suppress existing NullableCollections lints
Bug: 152525509
Bug: 154763999
Test: make checkapi
Change-Id: Iecd0927e6be5496b2fbd1a49396db5439257ffe4
2021-02-01 15:04:10 +01:00
Hall Liu
070fb692d2 Improve documentation for ImsCallProfile extras
Fixes: 178498784
Test: Docs only
Change-Id: I1b4bc136ec6307fbbf408982a7e17dc1e46c61b0
2021-01-30 01:44:54 +00:00
Treehugger Robot
d1fac34c38 Merge "Throw IllegalStateException to fail fast in IMS" am: 7bbf421612 am: 0fb9491c10 am: 770d0c072b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559442

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia24713bd912da22c0ec011813fbcb92e4dc93221
2021-01-29 23:11:52 +00:00
Treehugger Robot
770d0c072b Merge "Throw IllegalStateException to fail fast in IMS" am: 7bbf421612 am: 0fb9491c10
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559442

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I34b60fc181da390079ea86648d45730917fba468
2021-01-29 22:22:07 +00:00
Daniel Bright
db95bcf851 Partial hal support for secondary link bandwidth
* Added modemReducedFeatureSet1 flag to HalDeviceCapabilities
* Applied flag to secondary link bandwidth getters in carrier bandwidth

Test: cts
Bug: 173806995
Change-Id: I5dd23812fe72b751ab29459111d0bc8f6cc63e39
Merged-In: I5dd23812fe72b751ab29459111d0bc8f6cc63e39
2021-01-29 11:30:43 -08:00
Zoey Chen
20c5582b51 Merge "[PhysicalChannelConfig] RIL will report UNKNOWN range to PhysicalChannelConfig and it can not throw out Exception." into sc-dev 2021-01-29 02:23:24 +00:00
Treehugger Robot
7bbf421612 Merge "Throw IllegalStateException to fail fast in IMS" 2021-01-28 23:59:11 +00:00
Hall Liu
0fdcbb8cfb Merge changes from topic "composer-final-integration" into sc-dev
* changes:
  Rename TelecomManager.EXTRA_INCOMING_PICTURE
  Add support for integrating call composer
2021-01-28 22:49:22 +00:00
Jiashen Wang
06bca1be6c Merge changes from topics "downloadable_init_change_1", "downloadable_init_change_2" am: f2193be3f0 am: 7556b81f80
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562763

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I16864675dc1a3bfa6b257bf5ba52ea3fe2f86658
2021-01-28 21:32:34 +00:00
Jiashen Wang
d27f188913 Init DownloadableSubscription with Confirmation Code am: 738abf603a am: bff8fecf85
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562762

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I109155dfb8d744804a20ace7cb6a64e5f95faa53
2021-01-28 21:32:31 +00:00
James Lin
a8053430ae Merge "Expose the RCS UCE APIs for capabilities request with presence mechanism." am: 4548fab7d6 am: 795855ec7b am: 108a1933ca
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550598

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6be307948ed6bc4600294ec628585018be3cccde
2021-01-28 21:14:08 +00:00
James Lin
108a1933ca Merge "Expose the RCS UCE APIs for capabilities request with presence mechanism." am: 4548fab7d6 am: 795855ec7b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550598

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If010dd634828edb03ecb115c7cdc42f3faade053
2021-01-28 21:06:35 +00:00