Commit Graph

12693 Commits

Author SHA1 Message Date
TreeHugger Robot
b467333c5b Merge "Revert "Add a blacklist for preinstalled carrier apps."" into rvc-dev am: ddb640a883
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11809242

Change-Id: Icea3e45139b073ba4caee9fc399590b42cba4f01
2020-06-10 19:47:47 +00:00
Andrew Sapperstein
c4b36e9d00 Revert "Add a blacklist for preinstalled carrier apps."
This reverts commit 1a3158b8e1.

Reason for revert: The carrier for which this was needed has been
updated to no longer require this change.

Change-Id: I5d07bd7ce4bde11a287f44ad2ff97370d4c30db6
Merged-In: I5d07bd7ce4bde11a287f44ad2ff97370d4c30db6
Bug: 138150105
Fixes: 157957579
Test: verify that app is no longer there
2020-06-09 18:38:05 +00:00
TreeHugger Robot
9a147470ff Merge "Update UL values for NR" into rvc-dev am: a4d247cfbf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11739778

Change-Id: Ie0dbae279d7f3020dbea9d8c9b043ae99841b299
2020-06-05 20:04:17 +00:00
TreeHugger Robot
a4d247cfbf Merge "Update UL values for NR" into rvc-dev 2020-06-05 19:55:07 +00:00
Sarah Chin
6963421dfe Update UL values for NR
Test: build
Bug: 158218596
Change-Id: I2d548711c5de9683b57dc7bbeea9379d23b18343
2020-06-04 11:29:21 -07:00
Jack Yu
74f7d0ffda 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: I49aaee5a46645a554989cd5f1332606f7dda0d0f
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
3e05781310 Merge "Remove IllegalArgumentException for registration of capabilities" into rvc-dev am: 0093603809
Change-Id: I02fb3f69f51388394e09fa7b72698fefca8498c3
2020-05-27 18:24:07 +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
561968548b Merge "Remove spammy log line." into rvc-dev am: 505380e42c
Change-Id: I21d392a20a1b2d928b17a5ceaa1a174899ca1572
2020-05-27 03:19:29 +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
6dac0489e5 Merge "[KDDI] Define carrier config for call forwarding items" into rvc-dev am: 07fd727050
Change-Id: Ia3e19d0ba36dd30bb0fce2c80c5d350713ef1275
2020-05-25 03:14:28 +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
7064773052 Merge "Fix MmTelFeatureConnection Memory Leak" into rvc-dev am: 0b35eb55a8
Change-Id: If4109bb96be879972bcf6db1bb330756d856ed81
2020-05-20 19:27:43 +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
Chen Xu
a97cbb8bd6 Merge "allow CBR to write SMS database" into rvc-dev am: b44d6d6d48
Change-Id: Idc24a3c6b63ed4dea663f371a24073596e91abd1
2020-05-19 05:01:01 +00:00
Chen Xu
b44d6d6d48 Merge "allow CBR to write SMS database" into rvc-dev 2020-05-19 04:41:50 +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
e173fbf47c Merge "Fix UCE docs" into rvc-dev am: b8ec05c9f0
Change-Id: I482f826b0fe11eecb6b976fd8d5be8efc472f935
2020-05-19 00:02:57 +00:00
Hunter Knepshield
98dbfc41d4 Merge "Reapply aosp/970247 to fix SubInfo#toString." into rvc-dev am: 7eeed0981e
Change-Id: If0f1393a3a4dae5888236323d65c4e8c79c4c2c0
2020-05-19 00:01:24 +00: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
a84900e3df Merge "Create carrier config for NR enabled setting" into rvc-dev am: a718624635
Change-Id: Icac96dfc861d197caa0f6e7c47807e9c5dd4d8fd
2020-05-15 19:12:48 +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
eab99d7eac Merge "Update getSimCarrierId() document" into rvc-dev am: 4bf8746b40
Change-Id: I3d3d47c966da68f431564d136d8c2f4c011695a7
2020-05-14 02:07:25 +00:00
Calvin Pan
4bf8746b40 Merge "Update getSimCarrierId() document" into rvc-dev 2020-05-14 01:59:25 +00:00
Chen Xu
1eff8d2232 allow CBR to write SMS database
This is to support KR government requirement: CBR message should be available in
SMS.inbox. The solution is to insert CBR message once displayed to
users. this feature is disabled by default and OEM can turn it on for
specific mcc per country/carrier regulations.

Bug: 144749813
Test: Manual test on different messenger apps.
Change-Id: I5535cefb32e89694094299f3b89321f735983ef1
2020-05-13 16:25:22 -07: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
0c1ee8fdfa Merge "Rename max.active.modems to active_modems.max_count" into rvc-dev am: 2dfc9f85fe
Change-Id: Ia3d74559cec44eca1cc03e4a7a58e6f9b65811d0
2020-05-12 20:35:21 +00:00
Brad Ebinger
ab04c5958d Merge "Do not throw RemoteException for notifyUserActivity" into rvc-dev am: 3e79d2dcf9
Change-Id: Ie9a42c1358284f6c94fd1bc1a1afa5b11a08385f
2020-05-12 20:07:36 +00:00
Shuo Qian
fcac8d0cf5 Merge "Modify the default values to avoid 2 DB hysteresis DB limitation" into rvc-dev am: 95ff60f2fd
Change-Id: I8902f73f2539370e6879a31a3a189fa9bce4f3f1
2020-05-12 20:05:22 +00:00
Rambo Wang
61efc5c9c1 Merge "LTE+ indicator not shown when attached to CA network" into rvc-dev am: e6e7cdf1af
Change-Id: If7d8e4e0f8fbc68add4cb655eb8d307c7551305f
2020-05-12 19:49:09 +00: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
Rambo Wang
e6e7cdf1af Merge "LTE+ indicator not shown when attached to CA network" into rvc-dev 2020-05-11 16:36:32 +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
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
Amit Mahajan
1f980d3007 Add a helper function to query CBR package name.
Test: manual
Bug: 154436403
Change-Id: Id1e77abc4df88a3d5c3f28b366a7dfb415a2bbb0
Merged-in: Id1e77abc4df88a3d5c3f28b366a7dfb415a2bbb0
2020-05-07 20:19:56 +00:00
TreeHugger Robot
20b8e917b5 Merge "Add a helper function to query CBR package name." into rvc-dev 2020-05-07 19:50:30 +00:00
Amit Mahajan
851e1ad209 Add a helper function to query CBR package name.
Test: manual
Bug: 154436403
Change-Id: Id1e77abc4df88a3d5c3f28b366a7dfb415a2bbb0
Merged-in: Id1e77abc4df88a3d5c3f28b366a7dfb415a2bbb0
2020-05-06 19:42:25 +00:00
Collin Fijalkovich
31134a846b Merge changes from topic "rvc-telephony-caching" into rvc-dev am: a131a0c64f
Change-Id: I58d1838f22af117e46c359942b7166e8735720fe
2020-05-05 16:45:54 +00:00
Hall Liu
2ec58b1158 Refactor SubscriptionManager caching code am: 29b1874ffc
Change-Id: I8168420f37eb8324580c8ec648d091f0b5a5bb7f
2020-05-05 16:45:50 +00:00