Commit Graph

9755 Commits

Author SHA1 Message Date
Hall Liu
9fdfd90729 Merge "Add the addServiceAnnouncement API for EMBMS" am: 1ba0bc20b9 am: 7ffc3b9f58
Change-Id: I1d3b203a8782500ed26cc3df8b6dbabb1b4a5d02
2020-05-05 21:05:46 +00:00
Hall Liu
7ffc3b9f58 Merge "Add the addServiceAnnouncement API for EMBMS" am: 1ba0bc20b9
Change-Id: I81dae708fe3eb0b7c2bd3184a89fabde98bf4a74
2020-05-05 20:52:13 +00:00
Hall Liu
1ba0bc20b9 Merge "Add the addServiceAnnouncement API for EMBMS" 2020-05-05 20:42:31 +00:00
Collin Fijalkovich
5a017d5b58 Merge changes from topic "rvc-telephony-caching" into rvc-dev am: a131a0c64f
Change-Id: Id3ea8e7f53b6746512b2c971c457983493f26431
2020-05-05 16:46:39 +00:00
Hall Liu
92f928b250 Refactor SubscriptionManager caching code am: 29b1874ffc
Change-Id: I9b3eeade5d5b7ddc91ede9c340ab1381cb4e9278
2020-05-05 16:46:32 +00:00
Collin Fijalkovich
7652df0661 Cache getDefaultSmsSubscriptionId Binder calls am: 02e5c590c3
Change-Id: Ifb34aea7011b0115ae2486a765905a27b20d8ee8
2020-05-05 16:46:26 +00:00
Collin Fijalkovich
ec2f9e4167 Cache getActiveDataSubscriptionId Binder calls am: 7d7ce5135c
Change-Id: I4f9f9c777a03415ee4b9dcc32b352c874cb71e84
2020-05-05 16:46:22 +00:00
Collin Fijalkovich
a131a0c64f Merge changes from topic "rvc-telephony-caching" into rvc-dev
* changes:
  Cache getPhoneId and getSlotIndex binder calls.
  Refactor SubscriptionManager caching code
  Cache getDefaultSmsSubscriptionId Binder calls
  Cache getActiveDataSubscriptionId Binder calls
2020-05-05 16:30:39 +00:00
Hall Liu
4343998de3 Add the addServiceAnnouncement API for EMBMS
Add addServiceAnnouncement to MbmsDownloadSession, allowing apps to add
service announcements from group call servers and receive information
about available files via the MbmsDownloadSession API surface.

Fixes: 144368478
Test: CTS
Change-Id: I760400f56219879fe71d0115042a3be2f83cef90
Merged-In: I760400f56219879fe71d0115042a3be2f83cef90
2020-05-05 01:58:57 +00:00
Brad Ebinger
31ab32969c Merge "Fix wrong log" am: 8bf7a8487c am: 862a80faa0
Change-Id: Id9d67656e7554ea7121c09d0e2dd9899b9457bcc
2020-05-04 19:45:44 +00:00
Brad Ebinger
862a80faa0 Merge "Fix wrong log" am: 8bf7a8487c
Change-Id: If347dc6bead70e4513cf5dfcd7cc015a0730fa62
2020-05-04 19:27:32 +00:00
Brad Ebinger
8bf7a8487c Merge "Fix wrong log" 2020-05-04 19:08:01 +00:00
Nathan Harold
4b4becfd2a Merge changes from topic "pick-sst-location-iwlan" am: 19e83aca9d
Change-Id: I9793f00bd2d8a45bef7d1c1ea67ca046b133aba4
2020-05-04 16:21:32 +00:00
Nathan Harold
c0c8558a87 Make CellIdentity#getPlmn() Publicly Accessible am: e69e5b0c9c
Change-Id: I9b18806d5e22e2e14f10f917a4c85f7792dd96d0
2020-05-04 16:21:27 +00:00
Nathan Harold
19e83aca9d Merge changes from topic "pick-sst-location-iwlan"
* changes:
  Update GlobalCellId during Un-parceling
  Make CellIdentity#getPlmn() Publicly Accessible
2020-05-04 16:11:28 +00:00
Taesu Lee
50e1ecc4ab Fix wrong log
Test: none

Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
Change-Id: I3c80c20e36cbe32d5941547bda095cded42d78c7
2020-05-04 12:25:05 +09:00
Svet Ganov
d459a8da1e Revert an API breaking changes
bug:150281259

Test: N/A

Exempt-From-Owner-Approval: porting upstream

Change-Id: Ie30286456af15dd7b81bceb0547ffe8bfac422d2
Merged-In: Ie30286456af15dd7b81bceb0547ffe8bfac422d2
2020-05-03 05:38:43 +00:00
Andrew Sapperstein
f181c2f44b Fix broken @see tags in public documentation. am: 8fe35e5f21
Change-Id: Ic95104f61b736d05f18c7465e77951771f39fcbf
2020-05-02 00:36:07 +00:00
Andrew Sapperstein
8fe35e5f21 Fix broken @see tags in public documentation.
These were previously being suppressed by doclava but with this change,
all failures are fixed and the suppression logic has been removed.

To fix the issues, there were a few possible changes made:
- broken reference to a public API (such as incorrect parameters): fixed
- unnecessary @link inside an @see tag: fixed
- @see referring to an @hide or @SystemApi: reference removed
- broken references to inner class constructors
 - worked around by fully qualifying the constructor

Bug: 6963924
Test: make doc-comment-check-docs
Exempt-From-Owner-Approval: cherry-picked from master
Change-Id: Ifbdce2de96cdffa560bd90f549fa7184d1f9af85
Merged-In: Ifbdce2de96cdffa560bd90f549fa7184d1f9af85
(cherry picked from commit e0624c7a40)
2020-05-01 18:25:32 +00:00
Nathan Harold
9ced05a8b0 Update GlobalCellId during Un-parceling
The Global Cell-ID is constructed from other
fields in each CellIdentity.

Currently, it is not stored during parceling.
Thus, after a CellId is parceled and unparceled
this value is being lost.

Do a quick fix to update the global Cell ID during
unparceling. A longer-term fix is to resolve the
layering violations that create the situation where
the global Cell ID is defined in the base class
but manipulated in the derived classes.

Fixes a broken unit test.

Bug: 154955167
Test: atest ServiceStateTrackerTest#testRatRatchet
Merged-In: I5c58322ebcec8886405e25e09754c7f154187efe
Change-Id: I5c58322ebcec8886405e25e09754c7f154187efe
(cherry picked from commit 3f7dfb8239)
2020-04-30 16:26:47 -07:00
Sarah Chin
c7f7243030 Merge "Add legacy state to 5g timer configs" into rvc-dev am: 6be7d4c5fb
Change-Id: Id7649cc425d46b5409ac00358c1a6fb6770d79ab
2020-04-29 22:23:42 +00:00
Sarah Chin
6be7d4c5fb Merge "Add legacy state to 5g timer configs" into rvc-dev 2020-04-29 22:18:04 +00:00
Xiangyu/Malcolm Chen
9d3d7bd000 Merge "Add two ServiceState APIs back to @Unsupported list." into rvc-dev am: af242fb7e0
Change-Id: I60e055fae6228e139abb9100c01e95836548fdcd
2020-04-29 19:47:31 +00:00
Sarah Chin
4ab6a9e9e1 Add legacy state to 5g timer configs
Test: manual testing
Bug: 154186364
Change-Id: Iaf89f4ef9dfcea244033237f74818ab67e104b92
2020-04-29 11:23:05 -07:00
Brad Ebinger
c940169f68 Merge "Using RegistrationManager was causing unintended public APIs" am: 12df9e3d69
Change-Id: I893733b8376db997892ad5f4f0a0f9fca22fdf01
2020-04-29 17:36:46 +00:00
Brad Ebinger
12df9e3d69 Merge "Using RegistrationManager was causing unintended public APIs" 2020-04-29 17:07:04 +00:00
Collin Fijalkovich
41f94629c9 Cache getPhoneId and getSlotIndex binder calls.
Use PropertyInvalidatedCache to avoid redundant calls to
SubscriptionController getSlotIndex and getPhoneId.
Bug: 151953109
Test: Verified cache operated correctly when phone process is killed.
Test: atest SubscriptionControllerTest
Test: atest android.telephony.cts.SubscriptionManagerTest

Change-Id: I70552537af44f3e05b156cd190ebb28f0d940bf6
2020-04-28 16:30:40 -07:00
Hall Liu
29b1874ffc Refactor SubscriptionManager caching code
Create a genericized class to use for SubscriptionManager caching calls
in order to avoid duplicating logic that fetches values from ISub.

Bug: 151953109
Test: atest android.telephony.cts.SubscriptionManagerTest

Merged-In: I6682ded8aec8cb3e50521584c177df6d5dae8c49
Change-Id: I6682ded8aec8cb3e50521584c177df6d5dae8c49
2020-04-28 16:22:48 -07:00
Collin Fijalkovich
02e5c590c3 Cache getDefaultSmsSubscriptionId Binder calls
Use PropertyInvalidatedCache to avoid redundant
calls to SubscriptionController.getDefaultSmsSubscriptionId.
Bug: 151953109
Test: Verified cache operated correctly when phone process is killed.
Test: atest SubscriptionControllerTest
Test: atest android.telephony.cts.SubscriptionManagerTest

Merged-In: Iadb6a42b256013021903f75ed72bb5f046bfa2cc
Change-Id: Iadb6a42b256013021903f75ed72bb5f046bfa2cc
2020-04-28 16:22:28 -07:00
Malcolm Chen
9993fd6bff Add two ServiceState APIs back to @Unsupported list.
It was removed from boot-image-profile when we tried to expose them
for mainlining. Now it's @hide again, so we should add it back
into boot-image-profile otherwise it will break appss.

Bug: 153825725
Test: build
Change-Id: I7dcce69d3d2b3b2601f98817a4ee4467f7efb47a
2020-04-28 16:14:01 -07:00
Collin Fijalkovich
7d7ce5135c Cache getActiveDataSubscriptionId Binder calls
Use PropertyInvalidatedCache to avoid redundant
calls to SubscriptionController.getActiveDataSubscriptionId.
Bug: 151953109
Test: Verified cache operated correctly when phone process is killed.
Test: atest SubscriptionControllerTest
Test: atest android.telephony.cts.SubscriptionManagerTest

Merged-In: I45d1abf15e4b105c966d4a786a4dc33aa67b20aa
Change-Id: I45d1abf15e4b105c966d4a786a4dc33aa67b20aa
2020-04-28 16:03:59 -07:00
Sarah Chin
f7cda20342 Merge "Add carrier config for roaming meteredness" am: 1d7a6d3cc1
Change-Id: I890063a376285b3d23e4c5eafc71dfb7fe2016b7
2020-04-28 20:53:58 +00:00
Sarah Chin
a96be921a1 Merge "Add carrier configs for NR SA unmetered" am: df6e608fca
Change-Id: I086aef3228ff3c3a051889e5fe9bcc5a49351faa
2020-04-28 19:36:32 +00:00
Sarah Chin
86ef2bf419 Add carrier config for roaming meteredness
Test: atest DcTrackerTest, DataConnectionTest
Bug: 152541872
Change-Id: I07e9fd2cf42de8c6f924cda5e16aa6820baef4cd
Merged-In: I07e9fd2cf42de8c6f924cda5e16aa6820baef4cd
2020-04-28 12:29:25 -07:00
Sarah Chin
df6e608fca Merge "Add carrier configs for NR SA unmetered" 2020-04-28 19:23:47 +00:00
Automerger Merge Worker
2e91adae49 Merge "Merge "Unhide and update documentation for DisconnectCause" am: 61a728aebf am: d4e270a8ef" into rvc-dev-plus-aosp 2020-04-28 18:19:35 +00:00
Xiangyu/Malcolm Chen
835bf10d2a Merge "Add a @hide API to indicate 5G and DSDS conflict." am: 88fed59cc7
Change-Id: Ib4424d99e0447ab47133ce6f8f2da845d2dca1d8
2020-04-28 18:18:55 +00:00
Hall Liu
ecced7ad86 Merge "Unhide and update documentation for DisconnectCause" am: 61a728aebf am: d4e270a8ef
Change-Id: I63b1ed212848529fac75f072c3b6337e46ab527b
2020-04-28 18:18:22 +00:00
Brad Ebinger
190b52c6a0 Merge "Fix possible deadlock in incoming call" into rvc-dev am: 3faad57604
Change-Id: I09f67e66e971cb45159f719cd0e96192013eb1a1
2020-04-28 18:18:11 +00:00
Xiangyu/Malcolm Chen
88fed59cc7 Merge "Add a @hide API to indicate 5G and DSDS conflict." 2020-04-28 18:14:04 +00:00
Brad Ebinger
3faad57604 Merge "Fix possible deadlock in incoming call" into rvc-dev 2020-04-28 18:05:08 +00:00
Hall Liu
d4e270a8ef Merge "Unhide and update documentation for DisconnectCause" am: 61a728aebf
Change-Id: I71927e12920c3d6951159250ee0e34bd6241f0c9
2020-04-28 18:00:11 +00:00
Hall Liu
61a728aebf Merge "Unhide and update documentation for DisconnectCause" 2020-04-28 17:57:53 +00:00
Sarah Chin
d6d2e5c1a8 Merge changes from topics "displayinfocontroller", "remove_displayinfo" into rvc-dev am: 5227e8441d
Change-Id: I727196619e88bdcebc4dfee128ed9677bed9b44a
2020-04-28 16:50:34 +00:00
Sarah Chin
5227e8441d Merge changes from topics "displayinfocontroller", "remove_displayinfo" into rvc-dev
* changes:
  Remove constants for DisplayInfo logic from DcTracker
  Add carrier configs for 5G timer requirements
2020-04-28 16:48:19 +00:00
Collin Fijalkovich
b5ee33d74c Merge "Cache getDefaultDataSubscriptionId Binder calls" into rvc-dev am: f2f45653b4
Change-Id: I63a2dbab18074e3fe35b746169d740eaa217a988
2020-04-28 16:26:12 +00:00
Collin Fijalkovich
f2f45653b4 Merge "Cache getDefaultDataSubscriptionId Binder calls" into rvc-dev 2020-04-28 16:23:41 +00:00
SongFerng Wang
12c04fbb31 Merge changes Ib13d7371,Ia9055c9e am: ef0868a8a6
Change-Id: Icc5126ce8682a11927d8bec406f31fbcfdf8d981
2020-04-28 06:26:32 +00:00
Rambo Wang
930c825a88 NR is lower priority than all other signal strengths am: 105fe9349a
Change-Id: Ifc093d581a8bb5e79a9238bebf6bbdb6e94eac66
2020-04-28 06:26:26 +00:00
SongFerngWang
8893662fd5 For NR (non-standalone), use LTE signal strength as primary rule
There are two signal strengths, NR and LTE signal strength,
during NR (non-standalone). A lot of carriers' requirement define
UE show LTE signal strength on status bar during
NR (non-standalone).
Add a carrier config whether to use LTE signal strength as
primary during NR (non-standalone)

Bug: 152864241
Test: make pass.
Change-Id: Ib13d73719dace2d80aee5669181f4f934316ffd1
Merged-In: Ib13d73719dace2d80aee5669181f4f934316ffd1
(cherry picked from commit 68c58a57b0)
2020-04-28 05:36:15 +00:00