Treehugger Robot
d175285e54
Merge "[FUI22] Support getAllNetworkStateSnapshot" am: 4c73e05c1d am: 773a813dc2 am: ee3fc01443
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614779
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I52f8339bd1cda35a3f26f28fd3c0165f6f6ff91e
2021-03-05 07:10:46 +00:00
Treehugger Robot
773a813dc2
Merge "[FUI22] Support getAllNetworkStateSnapshot" am: 4c73e05c1d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614779
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I70cbeb9d2b5b4cb2d09d31444b5d60e887b7e8c2
2021-03-05 05:53:33 +00:00
Remi NGUYEN VAN
919a491443
Move NetworkState to Connectivity
...
NetworkState is becoming an internal implementation class, with
NetworkStateSnapshot replacing it as a proper API. Considering this it
belongs inside Connectivity.
Bug: 174123988
Test: m
Change-Id: I201f1a07c50d9da31e33f5c207875da8863ef57c
2021-03-05 08:56:55 +09:00
junyulai
b12113700c
[FUI22] Support getAllNetworkStateSnapshot
...
Currently, ConnectivityService has getAllNetworkState but it is
not ideal to expose as system API since the plan is to get rid
of NetworkState. Thus, create a new one that returns
NetworkStateSnapshot to fulfill the needs.
Note the original getAllNetworkState cannot be deleted now since
it has @UnsupportedAppUsage annotation.
Test: atest FrameworksNetTests
Bug: 174123988
Change-Id: Icddd434552b0e9ecbc8299e7242ec88cf3145aca
2021-03-04 18:41:09 +08:00
Frank Li
5d4495deb8
Merge "[CS05]Remove the hidden API usage of MetricsLogger" am: 4297526f8b am: 7f3280692c am: 8faf9990e6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612039
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2d784ac885ffcbc7a4539cf6e5b4774af5c11c43
2021-03-04 05:08:28 +00:00
Frank Li
7f3280692c
Merge "[CS05]Remove the hidden API usage of MetricsLogger" am: 4297526f8b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612039
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8de53ff3755ae4f15bdaf1b4f6dbd1850e99ed94
2021-03-04 02:52:52 +00:00
lucaslin
eaff72d544
Replace withCleanCallingIdentity with [clear|restore]CallingIdentity
...
To prevent using @hide method - withCleanCallingIdentity() from
mainline module, use clearCallingIdentity() &
restoreCallingIdentity() instead.
Bug: 172183305
Test: FrameworksNetTests, CtsNetTestCasesLatestSdk
Change-Id: I8221bb8717ba6809c5087ea2808cd4ccef948cfd
2021-03-04 09:38:21 +08:00
Frank Li
4297526f8b
Merge "[CS05]Remove the hidden API usage of MetricsLogger"
2021-03-04 01:34:53 +00:00
lucaslin
d9264b1fa3
Use ArraySet#add() instead of ArraySet#append()
...
ArraySet#append() is a hidden API which is not accessible for
mainline module, use public one - ArraySet#add() instead.
Bug: 170598012
Test: atest FrameworksNetTests
Change-Id: I0742e2ec7aff008141b1de6d10eeca2910df71b1
2021-03-04 09:29:30 +08:00
Xin Li
20bf52c7ca
[automerger skipped] Merge "Merge RQ2A.210305.007" am: 48172e9b5d -s ours am: cf96899431 -s ours am: 49ceda904a -s ours
...
am skip reason: Change-Id I2958205678f4340e96ce6e845718e994a0231afc with SHA-1 9882ff4bf8 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1613627
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I988e8a4b397af4360da97e97c79307ba62b155f6
2021-03-04 00:12:15 +00:00
Xin Li
cf96899431
[automerger skipped] Merge "Merge RQ2A.210305.007" am: 48172e9b5d -s ours
...
am skip reason: Change-Id I2958205678f4340e96ce6e845718e994a0231afc with SHA-1 9882ff4bf8 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1613627
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I05ab53a6a483b8e4dbe40afe6dab40e2b7d328ea
2021-03-03 22:35:44 +00:00
Xin Li
48172e9b5d
Merge "Merge RQ2A.210305.007"
2021-03-03 21:41:39 +00:00
Sarah Chin
fe5fd53865
[automerger skipped] Merge "APIs for 5G slicing" am: 08b9f41364 am: 65c1964746 am: 770d3084d9 -s ours
...
am skip reason: Change-Id I7433976bfe25bcb2af85ffb9338959cbcc9f42f3 with SHA-1 e7ec282eee is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1593931
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6c13c91ef58cc52bceac6214aa3fef6f7802fe78
2021-03-03 20:24:13 +00:00
Sarah Chin
65c1964746
Merge "APIs for 5G slicing" am: 08b9f41364
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1593931
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4d2a9cd1442a1bd0f194d5bb2b17f98c3f29e747
2021-03-03 18:59:57 +00:00
lifr
1c7789742b
[CS05]Remove the hidden API usage of MetricsLogger
...
Legacy metrics are unused and deprecated, so they are being removed.
Therefore, delete the usage of the hidden MetricsLogger API.
Bug: 157966864
Test: atest CtsNetTestCases
atest CaptivePortalTest
atest ConnectivityServiceTest
Change-Id: I51241f5d50ec580015882c84dd917b015c700c7c
2021-03-03 10:17:52 +00:00
Zoey Chen
68d60cdb1a
[Telephony] Use TelephonyCallback instead of PhoneStateListener part1
...
Since the redesign of PhoneStateListener, use TelephonyCallback to get the callback of EVENT_*
Bug: 167684594
Test: make
Change-Id: Ia3b777b12142b104b5798804f50b34748f9bf28c
2021-03-03 13:25:54 +08:00
Sarah Chin
ae9a64d7da
APIs for 5G slicing
...
Create TrafficDescriptor class
Create new APN ENTERPRISE
Update setupDataCall and DataCallResponse to take TrafficDescriptor and
matchAllRuleAllowed
Move ApnTypes from Annotation to ApnSetting
Bug: 179312227
Test: atest FrameworksTelephonyTests
Change-Id: I7433976bfe25bcb2af85ffb9338959cbcc9f42f3
Merged-In: I7433976bfe25bcb2af85ffb9338959cbcc9f42f3
2021-03-03 14:16:21 +09:00
Paul Hu
bae12d7523
[automerger skipped] Merge "Implement Settings#checkAndNoteChangeNetworkStateOperation on CS" am: 1ea28296e6 am: 30a049e285 am: 5e62891a8a -s ours
...
am skip reason: Change-Id I6f03398c1735b89470ad5bdbe3a036929daeb53c with SHA-1 3ba84e60f9 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560476
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If9e11c925da1cb7a94c812f68b60c77350c26770
2021-03-03 02:22:14 +00:00
Paul Hu
30a049e285
Merge "Implement Settings#checkAndNoteChangeNetworkStateOperation on CS" am: 1ea28296e6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560476
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4ad8f2d923e9415460c02002750a3766978272a6
2021-03-03 01:34:48 +00:00
Paul Hu
1ea28296e6
Merge "Implement Settings#checkAndNoteChangeNetworkStateOperation on CS"
2021-03-03 01:07:20 +00:00
Remi NGUYEN VAN
ed29c2cf8d
Merge "Move OemNetworkPreferences aidl to connectivity" am: 4daa02ee79 am: 1063e9ff33 am: e268e877c6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612038
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib37a92a20b907faed245cca914b46be9b8c1e7fb
2021-03-02 21:09:58 +00:00
Remi NGUYEN VAN
6fd9e1b31d
Merge "Move UidRange to connectivity" am: f251c52efb am: c46edc6c24 am: 6dd910c726
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612295
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie9d41595a21c494931e9bf45bfc4e8b2aa9803f3
2021-03-02 21:09:32 +00:00
Treehugger Robot
786edfae7a
Merge "Add modules-utils-os to service-connectivity" am: 6da87e0692 am: a941d46227 am: 939790b120
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612195
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7bf0262dc4542e8cdf07ebf19a3367fa9b57f385
2021-03-02 21:09:13 +00:00
Remi NGUYEN VAN
eb0cc323ce
Merge "Move Proxy, PacProxySelector out of Connectivity" am: a103c450bc am: 694f952a30 am: a7005ec455
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1598157
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib253a7ccf3beb8e9e5d0988db3d0662074dedda7
2021-03-02 20:37:24 +00:00
Remi NGUYEN VAN
1063e9ff33
Merge "Move OemNetworkPreferences aidl to connectivity" am: 4daa02ee79
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612038
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I11b9be22935b9fd7cf53b268103a1ce4635a6afd
2021-03-02 20:27:29 +00:00
Remi NGUYEN VAN
c46edc6c24
Merge "Move UidRange to connectivity" am: f251c52efb
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612295
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I672615b0804b9a9de4befa1ba5aea2efb9c962df
2021-03-02 20:24:20 +00:00
Treehugger Robot
a941d46227
Merge "Add modules-utils-os to service-connectivity" am: 6da87e0692
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612195
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I22df4afec8f8b5024d099966c0ca0f78b55ff08a
2021-03-02 20:19:24 +00:00
Remi NGUYEN VAN
32e2c767fe
Merge "Move SocketUtils out of the connectivity module" am: e467f13ace am: 3c2c63e525 am: 1efb1bf4a8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1592273
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9de14464ebb9d43e7c4fdc683c23ddbbcc7ef269
2021-03-02 19:56:48 +00:00
Remi NGUYEN VAN
3d6cee3c7d
Merge "Move QoS API classes to Connectivity" am: 32a606fe54 am: c535ef183f am: 045c615bb2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1611876
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8b7416a1d5c8103415246016f43dddc932d0be2b
2021-03-02 19:53:40 +00:00
Remi NGUYEN VAN
694f952a30
Merge "Move Proxy, PacProxySelector out of Connectivity" am: a103c450bc
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1598157
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id81273b33752ff353dfebdd2cd3faf43429f1a29
2021-03-02 19:52:58 +00:00
Remi NGUYEN VAN
3c2c63e525
Merge "Move SocketUtils out of the connectivity module" am: e467f13ace
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1592273
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib2d4b5574ba710eb50c438144e2b87f6c8954336
2021-03-02 19:48:26 +00:00
Paul Hu
324ccfa064
Merge "Implement Settings#checkAndNoteChangeNetworkStateOperation on CS" into sc-dev
2021-03-02 13:03:13 +00:00
Remi NGUYEN VAN
4daa02ee79
Merge "Move OemNetworkPreferences aidl to connectivity"
2021-03-02 09:29:07 +00:00
Remi NGUYEN VAN
f251c52efb
Merge "Move UidRange to connectivity"
2021-03-02 09:27:50 +00:00
Treehugger Robot
6da87e0692
Merge "Add modules-utils-os to service-connectivity"
2021-03-02 08:59:35 +00:00
Remi NGUYEN VAN
a103c450bc
Merge "Move Proxy, PacProxySelector out of Connectivity"
2021-03-02 07:49:00 +00:00
Remi NGUYEN VAN
e467f13ace
Merge "Move SocketUtils out of the connectivity module"
2021-03-02 06:44:01 +00:00
Remi NGUYEN VAN
5115480e8f
Move UidRange to connectivity
...
UidRange is a data class that is an implementation detail of
Connectivity. Move it to the connectivity boundary.
Remaining usages of UidRange outside of Connectivity (in VPN) should be
migrated to other classes, like Range<Integer> or UidRangeParcel.
Bug: 181512874
Test: m
Change-Id: I6f2e3685ad1c07171dd90480d1e546329de8732d
2021-03-02 15:35:36 +09:00
Remi NGUYEN VAN
24d950ce5a
Move OemNetworkPreferences aidl to connectivity
...
Move the IOnSetOemNetworkPreferenceListener aidl definition to
framework-connectivity.
The interface is an internal implementation detail of
framework-connectivity, so it should be built inside the jar.
Bug: 181512874
Test: m
Change-Id: I898049b50fc620ee629587a9303f058e0a6d0272
2021-03-02 13:56:38 +09:00
Remi NGUYEN VAN
96a931b5b2
Add modules-utils-os to service-connectivity
...
service-connectivity needs the library so that module utilities are statically
linked, not picked up from the framework jar as hidden symbols.
Bug: 170598012
Change-Id: I1045b3784a4bdb902f44d848ccddb304986631c3
Test: m
2021-03-02 03:28:58 +00:00
Remi NGUYEN VAN
c535ef183f
Merge "Move QoS API classes to Connectivity" am: 32a606fe54
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1611876
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idad1f51e7f269c2cef9e836efa668a5a0afd4c5a
2021-03-02 01:28:59 +00:00
Remi NGUYEN VAN
a1433566fe
Move Proxy, PacProxySelector out of Connectivity
...
PacProxySelector is tied to IProxyService, which does not have a formal
API.
Proxy is the interface with ConnectivityService, and all its methods are
public or module API.
Bug: 171540887
Test: m
Change-Id: I8ceba961a81661c3e11d8179955b594d3cab6ff7
2021-03-01 18:35:26 +09:00
Remi NGUYEN VAN
070ff8bb9c
Move QoS API classes to Connectivity
...
The classes were added in S and are used to back ConnectivityManager
APIs. Add them to the connectivity boundary as they belong together with
ConnectivityManager.
Bug: 181512874
Test: m
Change-Id: I03b5978949b200a72813d1ebc4812d851fe3df37
2021-03-01 18:09:30 +09:00
Remi NGUYEN VAN
c99495dc3e
[automerger skipped] Merge "Split out the connectivity API surface" am: 306da2a1b5 am: 4a448c175f am: 51b9ccb115 -s ours
...
am skip reason: Change-Id I21c42f032efa6c10e36c749df3183ce9679303a7 with SHA-1 11b5a5cc71 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552658
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0494841fdc78274eda4698e1650be898fc4faf75
2021-03-01 08:50:52 +00:00
Junyu Lai
b083e81f73
Merge "Fix copyright license of VpnTransportInfo" am: 9b9f823f11 am: f83741d25d am: bc88904010
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607313
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibf6ba342dfbc92fc4852b96d1c3f3b3f34cc3322
2021-03-01 08:07:27 +00:00
Remi NGUYEN VAN
fb559351e4
Merge "Add public alternative for protectFromVpn" am: 0c04e41e7b am: 14b6af4431 am: e456ac2061
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605094
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If0c46c990def1b6884a6008841f3d5bd912b8650
2021-03-01 08:01:51 +00:00
Remi NGUYEN VAN
1e29080037
Move SocketUtils out of the connectivity module
...
SocketUtils contains system APIs for modules to interact for sockets,
wrapping internal APIs. It should be part of the platform to keep access
to the internal APIs.
This involves splitting NetworkUtils.protectVpn to NetworkUtilsInternal,
since SocketUtils and VpnService are the only users of that method.
The @UnsupportedAppUsage NetworkUtils.protectVpn has low usage
count, and is already available through VpnService.protect.
Bug: 181512874
Test: boots, VPN working
Change-Id: I7028d334975f7536c06afac7a22200c33db707ac
2021-03-01 16:50:08 +09:00
Remi NGUYEN VAN
4a448c175f
Merge "Split out the connectivity API surface" am: 306da2a1b5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552658
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6e51465cfeab43ff5f154771e2e22a7cd981d066
2021-03-01 02:10:04 +00:00
Remi NGUYEN VAN
306da2a1b5
Merge "Split out the connectivity API surface"
2021-03-01 01:07:19 +00:00
Paul Hu
40435af9f7
Merge "Use alternative PhoneStateListener formal API" am: 73e1c90697 am: 181827f862 am: 5611936630
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554994
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib176dcbf9d2d60f3f7393e50d765f296a83b77ce
2021-02-26 17:25:40 +00:00