Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
501,231 Commits 3 Branches 0 Tags
00a3a86389e58231df26bc09b319f03e64fb0213
Commit Graph

13021 Commits

Author SHA1 Message Date
Sarah Chin
955e16b73e Merge "Create carrier config for NR enabled setting" into rvc-dev am: a718624635 
Change-Id: Iafffb1890848729d4983f06b2268d1e294cd43d5
 2020-05-15 18:49:12 +00:00
Sarah Chin
a718624635 Merge "Create carrier config for NR enabled setting" into rvc-dev 2020-05-15 18:47:12 +00:00
Calvin Pan
58f63aee4b Merge "Update getSimCarrierId() document" into rvc-dev am: 4bf8746b40 
Change-Id: Id1101bb990e3f308f0743daeb665ca76404a9710
 2020-05-15 15:42:51 +00:00
Sarah Chin
39c87c67d8 Create carrier config for NR enabled setting 
Test: build
Bug: 155915216
Change-Id: Ib81bb6b1712fcf53723df04f162c50a89c96e04d
 2020-05-13 23:44:12 -07:00
Calvin Pan
4bf8746b40 Merge "Update getSimCarrierId() document" into rvc-dev 2020-05-14 01:59:25 +00:00
calvinpan
18d70ab7b0 Update getSimCarrierId() document 
Carrier_list.pb move to latest_carrierid/ folder, so update the
description.

Bug: 155254987
Test: Build pass
Change-Id: Iacf1bfe68fa86194e8b75cbfce9aa37c0abfbca3
 2020-05-13 12:11:33 +08:00
Xiangyu/Malcolm Chen
2dfc9f85fe Merge "Rename max.active.modems to active_modems.max_count" into rvc-dev 2020-05-12 18:12:53 +00:00
Brad Ebinger
ce1220b912 Merge "Do not throw RemoteException for notifyUserActivity" into rvc-dev am: 3e79d2dcf9 
Change-Id: I65055dd607613c5cddb3300552c89e86ef13bb20
 2020-05-11 20:38:51 +00:00
Shuo Qian
39ba45aee1 Merge "Modify the default values to avoid 2 DB hysteresis DB limitation" into rvc-dev am: 95ff60f2fd 
Change-Id: I5f8595cfd67dc60ab78faffafc19fa0a3976a472
 2020-05-11 20:37:25 +00:00
Brad Ebinger
3e79d2dcf9 Merge "Do not throw RemoteException for notifyUserActivity" into rvc-dev 2020-05-11 20:35:00 +00:00
Shuo Qian
95ff60f2fd Merge "Modify the default values to avoid 2 DB hysteresis DB limitation" into rvc-dev 2020-05-11 20:22:13 +00:00
Brad Ebinger
c02f414712 Do not throw RemoteException for notifyUserActivity 
PowerManager does not rely on TelephonyManager#notifyUserActivity
to complete successfully since it is a oneway notification. If it
fails, due to telephony not being alive, do not throw a
RemoteException.

Bug: 156203930
Test: manual
Change-Id: I4c788fef5a887c45dbc3a20b7c8af40beed8d00a
 2020-05-11 11:12:36 -07:00
Rambo Wang
8e13cb99fa Merge "LTE+ indicator not shown when attached to CA network" into rvc-dev am: e6e7cdf1af 
Change-Id: I1e3f1b74f7e3d5021a720ac226e4832704277c8d
 2020-05-11 16:40:43 +00:00
Xiangyu/Malcolm Chen
99b0cf2dc8 Merge "Rename max.active.modems to active_modems.max_count" am: 414a71126e am: 6a5a8d74a8 
Change-Id: Ib34c296ab404bdabc69823448c16320e80deacd1
 2020-05-09 02:03:51 +00:00
Xiangyu/Malcolm Chen
6a5a8d74a8 Merge "Rename max.active.modems to active_modems.max_count" am: 414a71126e 
Change-Id: I2dd958aa9f8d97ab4f476ad50afed3f884c189d9
 2020-05-09 01:47:54 +00:00
Malcolm Chen
412a6b5f6e Rename max.active.modems to active_modems.max_count 
Bug: 154072245
Test: build
Change-Id: Ie1ce63782994db8092128f81d10040e1a2d684ea
Merged-In: Ie1ce63782994db8092128f81d10040e1a2d684ea
 2020-05-09 01:45:01 +00:00
Xiangyu/Malcolm Chen
414a71126e Merge "Rename max.active.modems to active_modems.max_count" 2020-05-09 01:30:12 +00:00
Rambo Wang
8a41bbf466 LTE+ indicator not shown when attached to CA network 
NetworkTypeController (or DcTracker in aosp/master) will set lte
display type to LTE_CA when current ServiceState fulfills one of the
following conditions:
- getDataNetworkType return NETWORK_TYPE_LTE_CA
- isUsingCarrierAggregation return true

NetworkRegistrationInfo#getAccessNetworkTechnology() always returns LTE
when data rat is LTE CA. So the first condition will never get
fulfilled.

isUsingCarrierAggregation flag will only get updated when
ServiceStateTracker calls RatRatcheter.ratchet without location change.
This makes isUsingCarrierAggregation flag not always reliable to
determine if carrier aggregation is on.

The CL fix the issue by changing ServiceState#isUsingCarrierAggregation
to return true when ServiceState#getCellBandwidths return more than one.
The same condition is already used by RatRatcheter when set
isUsingCarrierAggregation flag in RatRatcheter#ratchet.

Bug: 154060784
Test: atest com.android.internal.telephony.ServiceStateTest
Test: atest android.telephony.cts.ServiceStateTest
Change-Id: Ie6c07cb58d2a40eeb10e8f0131c98212ba463517
 2020-05-09 00:32:30 +00:00
Daniel Bright
780f5638c2 Merge "Add CarrierConfig key to customize apn priority" am: 04e78abfd4 
Change-Id: Iae3414f321136590690e80c43b6b2e2d217be145
 2020-05-07 19:47:00 +00:00
Daniel Bright
04e78abfd4 Merge "Add CarrierConfig key to customize apn priority" 2020-05-07 19:31:07 +00:00
Sarah Chin
5e00b85f76 Merge "Add legacy state to 5g timer configs" am: 5699f000cb 
Change-Id: I3efd65adf9b578c75011f8b61dd832243c76c6f5
 2020-05-07 01:03:01 +00:00
Malcolm Chen
b3c815b0e0 Rename max.active.modems to active_modems.max_count 
Bug: 154072245
Test: build
Change-Id: Ie1ce63782994db8092128f81d10040e1a2d684ea
 2020-05-06 17:50:28 -07:00
Sarah Chin
8d5f3ad3bb Merge changes from topics "displayinfocontroller", "remove_displayinfo" am: 94c22b7194 
Change-Id: I67628d868754ca3e2ab74e0b2bcb49a468ec5b2e
 2020-05-06 23:49:33 +00:00
Sarah Chin
4c18cacdd6 Add carrier configs for 5G timer requirements am: c4ef473307 
Change-Id: I4d4396a4bcb36495c9c492ebed5d676585433df5
 2020-05-06 23:49:24 +00:00
Sarah Chin
a193f84a9d Add legacy state to 5g timer configs 
Test: manual testing
Bug: 154186364
Change-Id: Iaf89f4ef9dfcea244033237f74818ab67e104b92
Merged-In: Iaf89f4ef9dfcea244033237f74818ab67e104b92
 2020-05-06 16:45:24 -07:00
Sarah Chin
94c22b7194 Merge changes from topics "displayinfocontroller", "remove_displayinfo" 
* changes:
  Remove constants for DisplayInfo logic from DcTracker
  Add carrier configs for 5G timer requirements
 2020-05-06 23:26:42 +00:00
Sarah Chin
04511a9f28 Merge "Debug message fix" am: 15418261cc 
Change-Id: Ief60bab235ed796541675acc46428b07dfd6c7b2
 2020-05-06 21:41:58 +00:00
Jack Yu
c4e911d1d5 Debug message fix 
Fixed the toString and made overrideNetworkTypeToString
public for debugging purposes.

Fix: 154229268
Test: Manual
Change-Id: I5c886de22543188032df172810b987cff964577b
Merged-In: I5c886de22543188032df172810b987cff964577b
 2020-05-06 13:09:15 -07:00
Andrew Sapperstein
df8396f2c3 Fix last broken @see links in aosp. 
Seems that the doc-comment-check-docs wasn't in presubmit.

Bug: 6963924
Bug: 155825675
Test: make doc-comment-check-docs
Change-Id: I018a50cd76b0fd5f8c3642efa1374e53f1b746a6
Merged-In: Ib2e4360493275b79c72487ee1cb173bb5e0fd35f
 2020-05-05 22:16:10 -07:00
Andrew Sapperstein
50dd1eaaeb Fix last broken @see links in aosp. 
Seems that the doc-comment-check-docs wasn't in presubmit.

Bug: 6963924
Bug: 155825675
Test: make doc-comment-check-docs
Change-Id: I018a50cd76b0fd5f8c3642efa1374e53f1b746a6
Merged-In: Ib2e4360493275b79c72487ee1cb173bb5e0fd35f
 2020-05-06 01:55:04 +00:00
Daniel Bright
81f2bbd435 Add CarrierConfig key to customize apn priority 
clean cherry pick
Test: atest on com.android.internal.telephony.dataconnection
Test: Make phone call
Test: Send text message
Test: Hit websites on chrome
Test: Override pririties using carrier config using broadcast
Bug: 152324921
Merged-In: I259071334c135709fc98c989a9b7c8c35f449578
Merged-In: Ib2139a93768999c2a867e40fea8d86c0ce730130

Change-Id: Iaa0ef7d9e29e074c37abd9481c2cdd3e5ecc7cae
 2020-05-05 16:11:04 -07:00
Andrew Sapperstein
23d5746e06 Fix broken @see tags in public documentation. am: 1f6e22cbd8 
Change-Id: I04a78c9ba3770a4d651177aae697890094a52add
 2020-05-05 21:12:04 +00:00
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
Treehugger Robot
1ac3746aa8 Merge changes from topic "ctor-refs" 
* changes:
  Update inner class constructor refs to use proper syntax.
  Fix broken @see tags in public documentation.
 2020-05-05 21:00:06 +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