Paul Hu
c847b5cc35
Merge "Implement Settings#checkAndNoteChangeNetworkStateOperation on CS" am: 3f250d1da0 am: d81c20011a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560476
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iad6f9e6cabc5f7eccd0aad020b398950f0495703
2021-03-03 02:17:02 +00:00
Paul Hu
d81c20011a
Merge "Implement Settings#checkAndNoteChangeNetworkStateOperation on CS" am: 3f250d1da0
...
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
3f250d1da0
Merge "Implement Settings#checkAndNoteChangeNetworkStateOperation on CS"
2021-03-03 01:07:20 +00:00
Yan Yan
df431e094e
Merge "Support new IpSecAlgorithm AUTH_AES_CMAC" am: ca72617385 am: 7d67dda5c3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579251
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8ab124e454f007c0330de636bc9e8b2729fcf4dd
2021-03-02 21:29:39 +00:00
Yan Yan
7d67dda5c3
Merge "Support new IpSecAlgorithm AUTH_AES_CMAC" am: ca72617385
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579251
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic9cc8508fb44e10371bc76bb31f20340f8663b18
2021-03-02 21:08:15 +00:00
Treehugger Robot
2fd6d378c8
Merge "[FUI09] Expose NetworkStateSnapshot as system API" am: 7a593e640d am: d73af919b6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536708
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib59b32356b55200798c5e8c6f85174049b99770c
2021-03-02 21:05:36 +00:00
Treehugger Robot
c92d0ab048
Merge "[FUI17] Migrate NetworkStatsService to use NetworkStateSnapshot" am: ebfdaa502f am: 15c7e774c2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556553
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5a804c1011080df3b09b01930817b5d0c46cef4a
2021-03-02 21:05:02 +00:00
Treehugger Robot
d73af919b6
Merge "[FUI09] Expose NetworkStateSnapshot as system API" am: 7a593e640d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536708
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8eb6681328ad1f4a85bcc8c6c4b9446c23616b7a
2021-03-02 20:52:02 +00:00
Treehugger Robot
15c7e774c2
Merge "[FUI17] Migrate NetworkStatsService to use NetworkStateSnapshot" am: ebfdaa502f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556553
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2b19538843007e38e170163120f38477e4b76be8
2021-03-02 20:47:52 +00:00
Remi NGUYEN VAN
405b9a0f54
Merge "Move OemNetworkPreferences aidl to connectivity" am: d795b61a56 am: 695e5f6f62
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612038
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I91bc4b0463d092f59c3e5d2e59bc4704c336a710
2021-03-02 20:44:00 +00:00
Remi NGUYEN VAN
f9e689aa17
Merge "Move UidRange to connectivity" am: ea3a01abf9 am: beb3822e20
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612295
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic05c10eca12c3c43190c767b4cef6ad88a0835f5
2021-03-02 20:43:46 +00:00
Treehugger Robot
0de430ef26
Merge "Add modules-utils-os to service-connectivity" am: d55697b5e2 am: dec716d6d3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612195
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I173d225caf28c63a7cccbaf090c783775a6e01ec
2021-03-02 20:42:46 +00:00
Treehugger Robot
090cc9ea64
Merge "Replace checkNetworkStackPermission in TestNetworkService" am: e7b360f9f5 am: 7afcfc90ee
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612194
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I279528bf95a7cf575dad9965eac627cd52e6cca8
2021-03-02 20:34:45 +00:00
Remi NGUYEN VAN
695e5f6f62
Merge "Move OemNetworkPreferences aidl to connectivity" am: d795b61a56
...
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
beb3822e20
Merge "Move UidRange to connectivity" am: ea3a01abf9
...
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
dec716d6d3
Merge "Add modules-utils-os to service-connectivity" am: d55697b5e2
...
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
Treehugger Robot
7afcfc90ee
Merge "Replace checkNetworkStackPermission in TestNetworkService" am: e7b360f9f5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612194
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5dd6577a57be2234014527e3bd517b60c4fecb48
2021-03-02 20:16:39 +00:00
Remi NGUYEN VAN
f685f49896
Merge "Move Proxy, PacProxySelector out of Connectivity" am: 14bcef6a65 am: b7f911ad07
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1598157
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4cc62d59b1da5053a4af976e30d411d8f066bbcc
2021-03-02 20:08:28 +00:00
Remi NGUYEN VAN
b7f911ad07
Merge "Move Proxy, PacProxySelector out of Connectivity" am: 14bcef6a65
...
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
d0a8f0ab6e
Merge "Move SocketUtils out of the connectivity module" am: 24e5bceac5 am: f0b2caa08b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1592273
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icb9911ad2933d76acbfc8b23463639ffc82bb58b
2021-03-02 19:52:44 +00:00
Aaron Huang
2ba7d87ea7
Merge "Use the net-utils-device-common version of HexDump" am: 92e767c065 am: 600550be2f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607954
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ieac67b40ce57391a614bd627ba8d3db931031760
2021-03-02 19:52:05 +00:00
Lucas Lin
24b2a334d0
Merge changes I06ab0f2d,I8b146aa1 am: 22c42d573e am: cf985cf03e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596513
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ieff3c3cc14319782e264ed9b4a287b5581e6da90
2021-03-02 19:50:30 +00:00
Lucas Lin
de7ef4ab0b
Merge changes I35ed84fc,Ie6cfd77b,I4e4f929f,I751526e8 am: 51d01615d3 am: 25d2ee9e66
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607733
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2f6682b86e1e8d9899ea02320dd8de347e72c724
2021-03-02 19:49:13 +00:00
Remi NGUYEN VAN
f0b2caa08b
Merge "Move SocketUtils out of the connectivity module" am: 24e5bceac5
...
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
Aaron Huang
600550be2f
Merge "Use the net-utils-device-common version of HexDump" am: 92e767c065
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607954
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1085391b5649df72b6664d5cdf1756c5110287dc
2021-03-02 19:42:02 +00:00
Lucas Lin
cf985cf03e
Merge changes I06ab0f2d,I8b146aa1 am: 22c42d573e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596513
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0332bf0bf07a0a958c2e75b464d577021fd57746
2021-03-02 19:13:55 +00:00
Lucas Lin
25d2ee9e66
Merge changes I35ed84fc,Ie6cfd77b,I4e4f929f,I751526e8 am: 51d01615d3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607733
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia438f937106645eb0d6cb91772d437676bf716fd
2021-03-02 19:08:57 +00:00
Remi NGUYEN VAN
fc31f05aba
Merge "Move QoS API classes to Connectivity" am: 32a606fe54 am: c02f9028be
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1611876
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I774c494d6e0f136547cf9175abb6662fd106a6a3
2021-03-02 18:46:39 +00:00
Yan Yan
ca72617385
Merge "Support new IpSecAlgorithm AUTH_AES_CMAC"
2021-03-02 18:24:27 +00:00
Treehugger Robot
7a593e640d
Merge "[FUI09] Expose NetworkStateSnapshot as system API"
2021-03-02 16:08:03 +00:00
junyulai
c6e8355dbd
[FUI09] Expose NetworkStateSnapshot as system API
...
This is needed by NetworkStatsService and
NetworkPolicyManagerService to utilize the snapshots of
information of networks that grabbed from ConnectivityService.
Test: atest FrameworksNetTests NetworkPolicyManagerServiceTest
Bug: 174123988
Change-Id: I7e974ef7b23ba9ba6ee775eed9899b0c0e2eca55
2021-03-02 23:09:16 +08:00
Treehugger Robot
ebfdaa502f
Merge "[FUI17] Migrate NetworkStatsService to use NetworkStateSnapshot"
2021-03-02 13:21:32 +00:00
junyulai
527859f7a4
[FUI17] Migrate NetworkStatsService to use NetworkStateSnapshot
...
This change migrates NetworkStatsService and related code to use
NetworkStateSnapshot which is used for replacing the NetworkState.
This patch also changes some formating which is suggested by
the linter.
Test: FrameworksNetTests NetworkPolicyManagerServiceTest
Bug: 174123988
Change-Id: I547da8f411cb45bdadc376ac3cadf3f3c55bb282
2021-03-02 20:08:53 +08:00
Remi NGUYEN VAN
d795b61a56
Merge "Move OemNetworkPreferences aidl to connectivity"
2021-03-02 09:29:07 +00:00
Remi NGUYEN VAN
ea3a01abf9
Merge "Move UidRange to connectivity"
2021-03-02 09:27:50 +00:00
Treehugger Robot
d55697b5e2
Merge "Add modules-utils-os to service-connectivity"
2021-03-02 08:59:35 +00:00
Treehugger Robot
e7b360f9f5
Merge "Replace checkNetworkStackPermission in TestNetworkService"
2021-03-02 08:55:28 +00:00
Remi NGUYEN VAN
14bcef6a65
Merge "Move Proxy, PacProxySelector out of Connectivity"
2021-03-02 07:49:00 +00:00
Remi NGUYEN VAN
24e5bceac5
Merge "Move SocketUtils out of the connectivity module"
2021-03-02 06:44:01 +00:00
Remi NGUYEN VAN
4e85d98a6f
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
Aaron Huang
92e767c065
Merge "Use the net-utils-device-common version of HexDump"
2021-03-02 06:25:34 +00:00
Remi NGUYEN VAN
49c389926a
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
Lucas Lin
22c42d573e
Merge changes I06ab0f2d,I8b146aa1
...
* changes:
Use UserHandle#getIdentifier to get the userid
Add test for getStartUser(), getEndUser() and createForUser()
2021-03-02 04:13:32 +00:00
Lucas Lin
51d01615d3
Merge changes I35ed84fc,Ie6cfd77b,I4e4f929f,I751526e8
...
* changes:
Fix comments left on aosp/1547454 and aosp/1556106
Remove INetworkManagementService from ConnectivityService
Remove unused INetworkManagementService
Remove BaseNetworkObserver from Nat464Xlat
2021-03-02 04:07:35 +00:00
Remi NGUYEN VAN
1dd6922fda
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
b2a34f3db1
Replace checkNetworkStackPermission in TestNetworkService
...
Use the underlying PermissionUtils directly instead.
Bug: 178352309
Change-Id: I840a7b7d53531604a214b73f1f518b2ebb10e71e
Test: atest FrameworksNetTests
2021-03-02 02:27:42 +00:00
lucaslin
cdda475652
Use UserHandle#getIdentifier to get the userid
...
UidRange uses PER_USER_RANGE to calculate and get the userid,
but PER_USER_RANGE is a hidden API, so use getIdentifier to get
the userid instead.
Bug: 170598012
Test: atest FrameworksNetTests:UidRangeTest
Change-Id: I06ab0f2da8a33d2b718bbc3a609d3d6a5fe0a095
2021-03-02 02:21:39 +00:00
Remi NGUYEN VAN
c02f9028be
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
3a142b99f1
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
de9477571f
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