Commit Graph

13049 Commits

Author SHA1 Message Date
Jack Yu
28becbf0b8 Merge "Store ETWS primary information in the database" into rvc-dev am: dc9e545bd1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11712801

Change-Id: I2a353c1939bdd2487ffcc4df71b3903e95cdffb6
2020-06-04 00:54:08 +00:00
Jack Yu
059be24240 Store ETWS primary information in the database
ETWS primary/secondary flag needs to be saved in the
database in order to perform duplicate check later. Used the
hardcoded database column name because Android R API freezes.
Will remove the hardcode in the next Android release.

Fix: 157699377
Test: CtsTelephonyTestCases & CellBroadcastServiceTests
Change-Id: Iedec92a1f435f60ceb9f36637a1718adbbd7e2ae
2020-06-03 21:18:54 +00:00
Brad Ebinger
d3360490b7 Merge "Remove IllegalArgumentException for registration of capabilities" into rvc-dev am: 0093603809
Change-Id: I27e16b483d9a33fe5f0fadbfab9fd10ed9cdcf5b
2020-05-27 18:24:05 +00:00
Brad Ebinger
0093603809 Merge "Remove IllegalArgumentException for registration of capabilities" into rvc-dev 2020-05-27 18:10:51 +00:00
TreeHugger Robot
5671bd38db Merge "Remove spammy log line." into rvc-dev am: 505380e42c
Change-Id: I62364fa7772662b5e0523945568dbdce9f1c37b7
2020-05-27 03:19:36 +00:00
TreeHugger Robot
505380e42c Merge "Remove spammy log line." into rvc-dev 2020-05-27 03:01:09 +00:00
Amit Mahajan
5c5635ac7d Remove spammy log line.
Test: TH
Bug: 157172358
Change-Id: Ib76bd317bdd21ef6c1272d38f102f8e40b66d9b8
2020-05-26 14:51:21 -07:00
Allen Su
0e3639174d Merge "[KDDI] Define carrier config for call forwarding items" into rvc-dev am: 07fd727050
Change-Id: I8e6f40aee0c4bff7d7784accb75edc41471e3486
2020-05-25 03:14:33 +00:00
Allen Su
07fd727050 Merge "[KDDI] Define carrier config for call forwarding items" into rvc-dev 2020-05-25 02:54:22 +00:00
Brad Ebinger
ffb93e5dd6 Remove IllegalArgumentException for registration of capabilities
We threw an IllegalArgumentException for an invalid subscription,
however this is counter to what this exception should be used for.
Instead, use ImsException#CODE_ERROR_INVALID_SUBSCRIPTION.

Also fixed incorrect ImsException sent when telephony crashed.

Bug: 156402275
Test: atest FrameworksTelephonyTests; CtsTelephonyTestCases; manual
Change-Id: I3250419a2438afb58922ae653e3f2e4f9628e593
2020-05-21 16:41:01 -07:00
Brad Ebinger
9ced939313 Merge "Fix MmTelFeatureConnection Memory Leak" into rvc-dev am: 0b35eb55a8
Change-Id: Id06fda9d0a3f3995c9497410e79ccb72c4862a43
2020-05-20 19:28:00 +00:00
Brad Ebinger
0b35eb55a8 Merge "Fix MmTelFeatureConnection Memory Leak" into rvc-dev 2020-05-20 19:07:49 +00:00
allenwtsu
6206afc8c1 [KDDI] Define carrier config for call forwarding items
Test: build pass
Bug: 149274975
Change-Id: Ie49ca51497e8f0d9f16d14cc183311dcd02d8bbb
2020-05-19 23:06:33 +08: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
Amit Mahajan
963957ed4d Merge "DUT fail to unlock SIM after selecting Home IMSI from STK When unlock SIM pin,SIM begin refresh, and the UiccCardApp was disposed." am: 62120dcc8c am: 67bec2d79b
Change-Id: I2395255c3da76bb1da99fe243a280c65ba9baf95
2020-05-19 00:16:28 +00:00
Amit Mahajan
67bec2d79b Merge "DUT fail to unlock SIM after selecting Home IMSI from STK When unlock SIM pin,SIM begin refresh, and the UiccCardApp was disposed." am: 62120dcc8c
Change-Id: I50ca70c0e9a3a20bc64604e9e05cec619111679f
2020-05-18 23:55:10 +00:00
Amit Mahajan
62120dcc8c Merge "DUT fail to unlock SIM after selecting Home IMSI from STK When unlock SIM pin,SIM begin refresh, and the UiccCardApp was disposed." 2020-05-18 23:38:22 +00:00
TreeHugger Robot
baa92662b4 Merge "Fix UCE docs" into rvc-dev am: b8ec05c9f0
Change-Id: I40924079a2fa2c2db2eec7346e3989c4cbed6186
2020-05-18 23:09:39 +00:00
TreeHugger Robot
b8ec05c9f0 Merge "Fix UCE docs" into rvc-dev 2020-05-18 23:04:41 +00:00
Hunter Knepshield
15e6f1e9f0 Merge "Reapply aosp/970247 to fix SubInfo#toString." into rvc-dev am: 7eeed0981e
Change-Id: I8f97fcc445aa504fb29bf8e6f6bde06533f91322
2020-05-18 22:33:52 +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
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
Shuo Qian
9e80bca139 Merge "Modify the default values to avoid 2 DB hysteresis DB limitation" am: a059affff3
Change-Id: I2b7a90343be8d2e3b69d78dae9890ba28f01939f
2020-05-11 22:38:07 +00:00
Shuo Qian
e2faa8fff8 Modify the default values to avoid 2 DB hysteresis DB limitation
Test: Treehugger
Bug: 155026280
Change-Id: Ic1af774b28629c7ab0e105f6ce198bfce8d160a8
Merged-In: Ic1af774b28629c7ab0e105f6ce198bfce8d160a8
(cherry picked from commit 66c51cda97)
2020-05-11 20:57:28 +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
Rambo Wang
50612d1d1c Merge "LTE+ indicator not shown when attached to CA network" am: 1926b83e85
Change-Id: I85ce9363482a09aea2ce58940cdec41ee618ee8b
2020-05-11 20:20:29 +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
35c8eb194a 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
Merged-In: Ie6c07cb58d2a40eeb10e8f0131c98212ba463517
Change-Id: Ie6c07cb58d2a40eeb10e8f0131c98212ba463517
(cherry picked from commit 8a41bbf466)
2020-05-11 09:44:49 -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