Commit Graph

12425 Commits

Author SHA1 Message Date
Brad Ebinger
0b35eb55a8 Merge "Fix MmTelFeatureConnection Memory Leak" into rvc-dev 2020-05-20 19:07:49 +00:00
Brad Ebinger
64e101323b Fix MmTelFeatureConnection Memory Leak
In FeatureConnection, we never cleaned up the ImsFeatureStatusCallback
after it was destroyed, leaving zombie FeatureConnections around.

Bug: 156893040
Test: atest FrameworksTelephonyTests
Change-Id: Idcf8b558c3807a3f9f5094afee532e76ea6f02cb
2020-05-18 17:46:06 -07:00
TreeHugger Robot
b8ec05c9f0 Merge "Fix UCE docs" into rvc-dev 2020-05-18 23:04:41 +00:00
Hunter Knepshield
7eeed0981e Merge "Reapply aosp/970247 to fix SubInfo#toString." into rvc-dev 2020-05-18 22:30:16 +00:00
Hunter Knepshield
e23886b901 Reapply aosp/970247 to fix SubInfo#toString.
Looks like somewhere along the line this was partially overwritten by
another change. This makes the toString value consistent and stops the
MNC field from running into the country ISO code.

Test: compilation (trivial)
Change-Id: Ifdc00d340ae8ce31c224decebdd6c7aa4230bdb7
Bug: 8675309
2020-05-18 22:29:59 +00:00
Brad Ebinger
1735254a44 Fix UCE docs
Clarify some of the docs for UCE Intent.

Fixes: 156114453
test: docs only
Change-Id: I01617d0741055e347e05bdbd5eb5a6825f896e73
2020-05-18 21:22:26 +00:00
Sarah Chin
a718624635 Merge "Create carrier config for NR enabled setting" into rvc-dev 2020-05-15 18:47:12 +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
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
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
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
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
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
Shuo Qian
66c51cda97 Modify the default values to avoid 2 DB hysteresis DB limitation
Test: Treehugger
Bug: 155026280
Change-Id: Ic1af774b28629c7ab0e105f6ce198bfce8d160a8
2020-05-01 07:47:51 +00:00
Sarah Chin
6be7d4c5fb Merge "Add legacy state to 5g timer configs" into rvc-dev 2020-04-29 22:18:04 +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
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
Brad Ebinger
3faad57604 Merge "Fix possible deadlock in incoming call" into rvc-dev 2020-04-28 18:05:08 +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
f2f45653b4 Merge "Cache getDefaultDataSubscriptionId Binder calls" into rvc-dev 2020-04-28 16:23:41 +00:00
Alex Lin
45ee004b29 Merge "[DO NOT MERGE] Fix EuiccManager javadoc links" into rvc-dev 2020-04-28 00:57:29 +00:00
Brad Ebinger
fe6da864da Fix possible deadlock in incoming call
When notifying the framework of an incoming call, a lock is held
in both the MmTelFeature and MmTelFeatureConnection. This can cause
a deadlock if the MmTelFeatureConnection is also processing an
event, such as sending/acknowleging an SMS message.

Remove the lock around the listener methods to the framework, since
it is not needed.

Bug: 155083563
Test: atest CtsTelephonyTestCases:ImsServiceTest FrameworksTelephonyTests
Change-Id: I39f7192c6f79e215ef989797870f5f501197cd08
2020-04-27 15:44:32 -07:00
Collin Fijalkovich
ce43a5985e Cache getDefaultDataSubscriptionId Binder calls
Use PropertyInvalidatedCache to avoid redundant
calls to SubscriptionController.getDefaultDataSubscriptionId
Bug: 151953109
Test: Verified cache operated correctly when phone process is killed.
Test: atest SubscriptionControllerTest
Test: atest android.telephony.cts.SubscriptionManagerTest

Merged-In: Ifbd380a9281d7bc9c3a9b35c5e93207acabf8d15
Change-Id: Ifbd380a9281d7bc9c3a9b35c5e93207acabf8d15
2020-04-27 11:28:09 -07:00
Sarah Chin
86b8a847c7 Remove constants for DisplayInfo logic from DcTracker
Deprecate carrier configs for connected->not connected timer
Replaced DCT events with displayinfo changed listener

Test: atest NetworkTypeControllerTest, DcTrackerTest
Test: manual verify timer and meteredness works as expected
Bug: 154186364
Change-Id: I22a459e79f509f20c6b38386655c4b49315e3be7
2020-04-24 20:21:33 -07:00
Nathan Harold
3f7dfb8239 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
Change-Id: I5c58322ebcec8886405e25e09754c7f154187efe
2020-04-24 18:42:08 -07:00
Alex Lin
dafa2b0f3d [DO NOT MERGE] Fix EuiccManager javadoc links
replace java doc links from @see {@link ...} to @see #...}
Bug: 154439721
Test: Building the project

Change-Id: I5ffdb3c56a01a6454d2d640898c1d7e24b63ae40
2020-04-24 23:49:06 +00:00
Collin Fijalkovich
cffe947079 Merge "Cache getDefaultSubscriptionId Binder calls" into rvc-dev 2020-04-24 20:54:04 +00:00
Collin Fijalkovich
4ffdedfd4b Cache getDefaultSubscriptionId Binder calls
Use PropertyInvalidatedCache to avoid redundant
calls to SubscriptionController.getDefaultSubscriptionId
Bug: 151953109
Test: Flashed build and verified that the phone booted
and executed the cache

Merged-In: I69b178b42a49b1eda6c2e72ce21d93906ff9d281
Change-Id: I69b178b42a49b1eda6c2e72ce21d93906ff9d281
2020-04-24 10:45:54 -07:00
Sarah Chin
46941d62b8 Add carrier configs for 5G timer requirements
Test: atest OverrideNetworkTypeController
Bug: 154186364
Change-Id: I1e31ea85ccbe5c84b295674ce82ff0725958a96f
2020-04-23 11:16:56 -07:00
Nathan Harold
741d281c60 Make CellIdentity#getPlmn() Publicly Accessible
Add support for telephony to access getPlmn().

Bug: 148111627
Test: compilation (trivial)
Change-Id: I5a79e5339a7e4e1351582f199559801069df0c76
2020-04-21 18:45:30 -07:00
Brad Ebinger
c05ba6325d Merge "Using RegistrationManager was causing unintended public APIs" into rvc-dev 2020-04-21 22:33:37 +00:00
Jordan Liu
74918ad98b Merge "Implement equals and hashCode" into rvc-dev 2020-04-20 18:50:02 +00:00
Jack Yu
3fc3559385 Merge "Debug message fix" into rvc-dev 2020-04-18 03:28:15 +00:00
Jack Yu
06d85c3da9 Debug message fix
Fixed the toString and made overrideNetworkTypeToString
public for debugging purposes.

Fix: 154229268
Test: Manual
Change-Id: I5c886de22543188032df172810b987cff964577b
2020-04-17 16:05:53 -07:00
Jordan Liu
00fd9fd017 Implement equals and hashCode
This keeps SmsHeader in sync with cellbroadcastservice.SmsHeader.

Bug: 148482334
Test: builds
Change-Id: I2a3188a603595e4c97acf6413036dcddf35c0b87
2020-04-17 19:10:59 +00:00
Mingming Cai
3f9e9edb8e Make MNC length hidden public
Make CellIdentity.MNC_MIN_LENGTH and CellIdentity.MNC_MAX_LENGTH
hidden public to support IccRecords changes.

Bug: 152518548
Test: make
Change-Id: Ic253a6bbbf07e4ce62a7ea25ca67dff54e2c67c8
2020-04-17 03:17:46 -07:00
TreeHugger Robot
bd9f62a4d1 Merge "Set legacy MTU field for backward compatibility" into rvc-dev 2020-04-16 05:35:16 +00:00
Jack Yu
8d41fd3a92 Set legacy MTU field for backward compatibility
For IWLAN, MTU is not negotiated as part of the RA. The interface
MTU is still necessary here to ensure full backward compatibility.
To workaround this, we set legacy mtu field with the larger value
of mtu v4 and mtu v6.

Fix: 153470573
Test: FrameworkTelephonyTests
Change-Id: I0671618817a295cc4e9c75df17501de338dbe155
2020-04-15 16:15:23 -07:00
TreeHugger Robot
f3b2dc9b03 Merge "[5G settings UI] Add config for the 5G limited VoLTE alert dialog" into rvc-dev 2020-04-15 08:47:04 +00:00
Sarah Chin
dc310318e9 Add carrier config for roaming meteredness
Test: atest DcTrackerTest, DataConnectionTest
Bug: 152541872
Change-Id: I07e9fd2cf42de8c6f924cda5e16aa6820baef4cd
2020-04-14 17:25:40 -07:00
Brad Ebinger
db3e8ee013 Using RegistrationManager was causing unintended public APIs
Remove the dependency on this interface until it is intended
to be public.

Fixes: 153908410
Test: atest CtsTelephonyTestCases
Change-Id: Iad82b7d06738468861bd49164fbb4b4dafb8c014
2020-04-14 15:17:46 -07:00