LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,933 Commits 2 Branches 0 Tags
d97c467e2a0fed6835fbb0e790c35a4efd0f4000
Commit Graph

13933 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
paulhu
d97c467e2a Remove unused NetworkPolicyManagerInternal in CS 
ConnectivityService doesn't call any NPMI methods, so remove all
usage from CS.

Bug: 170598012
Test: atest FrameworksNetTests
Test: atest FrameworksNetIntegrationTests
Change-Id: I8719ef2e96e7db9da2894b467b9e7a1bc09de386
 2021-03-19 14:29:01 +08:00
Anthony Stange
50468db6e5 [automerger skipped] Merge "Revert "Add an API to listen for changes in network blocked status of an uid."" am: 2bb1da3473 -s ours am: 00a2a4c7ce -s ours am: 0a45e2c173 -s ours 
am skip reason: skip tag Change-Id Ib9949b8619c6b148f73630b314c4113d76c31ec1 with SHA-1 cb5fd4a670 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645826

Change-Id: I682d85048801567ff9cffbc0e7ded0290ca86bdb
 2021-03-18 18:32:20 +00:00
Anthony Stange
e3e5f29233 Merge changes from topic "revert-1626206-replaceUidRange-MSYTKFNGUE" am: 2576238aec am: 37cb1551a0 am: a2c19b719d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645768

Change-Id: Ia5cedb12112b04885c3f9270b9171c6494b8d2af
 2021-03-18 18:29:41 +00:00
Sudheer Shanka
7c21dfd282 [automerger skipped] Merge "Add an API to listen for changes in network blocked status of an uid." am: c262455617 am: 5580953ba4 am: 0a57ff459d -s ours 
am skip reason: skip tag Change-Id Ib9949b8619c6b148f73630b314c4113d76c31ec1 with SHA-1 cb5fd4a670 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612823

Change-Id: Ib66aa700dadfb0f61dec05429ace186f87040ad7
 2021-03-18 18:27:30 +00:00
Lucas Lin
3606076fe1 Merge "Expose systemReady for SystemServer" am: 33737f6ac4 am: 7d2c52067f am: 91ee69fca8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640142

Change-Id: I95488b39a32ed9086839eab6c457ed6f75472df1
 2021-03-18 18:27:08 +00:00
Chiachang Wang
9bd228e4da Merge changes from topic "replaceUidRange" am: 7b582e9749 am: 38794c5290 am: 28f5f912c5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626206

Change-Id: Ibc5e47f175a0e5433492f81068da9f42496e660b
 2021-03-18 18:26:42 +00:00
Chiachang Wang
332f379a59 Merge "Expose APIs for Settings" am: 53178361ae am: 94e9fb339f am: 259c30a6de 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644202

Change-Id: I13a56aa7dcc19efef3dc268fabfa52069360eb18
 2021-03-18 18:26:16 +00:00
Lorenzo Colitti
cca30a72ac Merge "Add a VpnManager.TYPE_VPN_OEM." am: 96d66bb7b8 am: 6ace66ed21 am: 7853e40205 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644265

Change-Id: I512785d414fcfd4819cdf26ff3c3403c049db475
 2021-03-18 18:25:54 +00:00
Chalard Jean
dc82a6413f Merge "Address remaining comments on aosp/1607893" am: 08b0411d4f am: ec138734a7 am: 4c83d1509c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640140

Change-Id: I4d6db2b92d56c3a75ec7a2964df236e9cbdc8f03
 2021-03-18 18:25:31 +00:00
Chalard Jean
4ec606c49d Merge "Move constants to MODULE_LIB" am: 229cf59510 am: 39356af73f am: 80e68e5d1d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640141

Change-Id: I514f5a3d1a4b1498f58170ac652ede394ddf6aeb
 2021-03-18 18:24:57 +00:00
Anthony Stange
0a45e2c173 [automerger skipped] Merge "Revert "Add an API to listen for changes in network blocked status of an uid."" am: 2bb1da3473 -s ours am: 00a2a4c7ce -s ours 
am skip reason: skip tag Change-Id Ib9949b8619c6b148f73630b314c4113d76c31ec1 with SHA-1 cc8f26dea8 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645826

Change-Id: If86357ec4e47c2de55377d84a44738f341d220bc
 2021-03-18 17:26:47 +00:00
Anthony Stange
a2c19b719d Merge changes from topic "revert-1626206-replaceUidRange-MSYTKFNGUE" am: 2576238aec am: 37cb1551a0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645768

Change-Id: Ic7f04ad2af282654f5a57c9e25e8dad9b78f114c
 2021-03-18 17:26:18 +00:00
Sudheer Shanka
0a57ff459d Merge "Add an API to listen for changes in network blocked status of an uid." am: c262455617 am: 5580953ba4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612823

Change-Id: I5f64c0872ba298e8b7a10f5a4348c35ff19a9bb5
 2021-03-18 17:25:15 +00:00
Anthony Stange
00a2a4c7ce [automerger skipped] Merge "Revert "Add an API to listen for changes in network blocked status of an uid."" am: 2bb1da3473 -s ours 
am skip reason: skip tag Change-Id Ib9949b8619c6b148f73630b314c4113d76c31ec1 with SHA-1 cc8f26dea8 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645826

Change-Id: Ib47f1d63ab15abf1ad8aba79f6f2922abf959010
 2021-03-18 17:11:21 +00:00
Anthony Stange
37cb1551a0 Merge changes from topic "revert-1626206-replaceUidRange-MSYTKFNGUE" am: 2576238aec 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645768

Change-Id: I311d4e3e5718afbe7d9817a4c85040d8afe5d66d
 2021-03-18 17:02:59 +00:00
Anthony Stange
2bb1da3473 Merge "Revert "Add an API to listen for changes in network blocked status of an uid."" 2021-03-18 16:52:08 +00:00
Anthony Stange
d88174dafd Revert "Add an API to listen for changes in network blocked status of an uid." 
This reverts commit cc8f26dea8.

Reason for revert: Breaking build - b/183106805
Bug: 183106805
Merged-In: Ib9949b8619c6b148f73630b314c4113d76c31ec1
Change-Id: I9789ed81e630f49c71034b6917188983bd11d774
 2021-03-18 16:51:22 +00:00
Anthony Stange
2576238aec Merge changes from topic "revert-1626206-replaceUidRange-MSYTKFNGUE" 
* changes:
  Revert "Replace the usage of UidRange"
  Revert "Expose uids related APIs in NetworkRequest and NetworkCa..."
 2021-03-18 16:40:53 +00:00
Anthony Stange
f0b9889ccf Revert "Replace the usage of UidRange" 
Revert "Add shims for NetworkRequest"

Revert submission 1626206-replaceUidRange

Reason for revert: Breaking build - b/183106405
Reverted Changes:
I0b79c73e8:Add shims for NetworkRequest
I4bc0daf5a:Replace the usage of UidRange
I4e5aec6ef:Replace the usage of UidRange
I107c329d4:Expose uids related APIs in NetworkRequest and Net...

Change-Id: I6290429db1c8e787f8138b55b98fd92a74ac6402
 2021-03-18 16:30:59 +00:00
Anthony Stange
84d92b3ce1 Revert "Expose uids related APIs in NetworkRequest and NetworkCa..." 
Revert "Add shims for NetworkRequest"

Revert submission 1626206-replaceUidRange

Reason for revert: Breaking build - b/183106405
Reverted Changes:
I0b79c73e8:Add shims for NetworkRequest
I4bc0daf5a:Replace the usage of UidRange
I4e5aec6ef:Replace the usage of UidRange
I107c329d4:Expose uids related APIs in NetworkRequest and Net...

Change-Id: I45e08f89533af0d6851add38fecb5c6c114615ae
 2021-03-18 16:30:59 +00:00
Sudheer Shanka
5580953ba4 Merge "Add an API to listen for changes in network blocked status of an uid." am: c262455617 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612823

Change-Id: Iff60405d8f925d0a95ea4bf3230da38ce822c9f2
 2021-03-18 16:09:58 +00:00
Sudheer Shanka
c262455617 Merge "Add an API to listen for changes in network blocked status of an uid." 2021-03-18 15:29:17 +00:00
Paul Hu
9d73b70404 resolve merge conflicts of 82227141f6 to sc-dev 
Bug: 182538166
Test: atest FrameworksNetTests
Change-Id: Idd5d75e0e9a7ad4f840b88da55d28fbaa2275dd0
 2021-03-18 14:50:05 +00:00
Lucas Lin
91ee69fca8 Merge "Expose systemReady for SystemServer" am: 33737f6ac4 am: 7d2c52067f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640142

Change-Id: Ic700e27e679a1f56b69ef082d4f5c7f5d12f8b6e
 2021-03-18 14:29:20 +00:00
Chiachang Wang
28f5f912c5 Merge changes from topic "replaceUidRange" am: 7b582e9749 am: 38794c5290 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626206

Change-Id: Ie767ae0818210b2f4946450bc6784b89514ff3ad
 2021-03-18 14:28:58 +00:00
Chiachang Wang
259c30a6de Merge "Expose APIs for Settings" am: 53178361ae am: 94e9fb339f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644202

Change-Id: I4a65fa2e637a01f13ac14d8413a7be47a37c7937
 2021-03-18 14:28:48 +00:00
Lorenzo Colitti
7853e40205 Merge "Add a VpnManager.TYPE_VPN_OEM." am: 96d66bb7b8 am: 6ace66ed21 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644265

Change-Id: Ic6865adf525d216d38c999a74bb4ffa35641e8a3
 2021-03-18 14:28:32 +00:00
Remi NGUYEN VAN
69f81f2ff7 Merge changes I4ad0ca60,I8a03162b into sc-dev 
* changes:
  Expose isUidNetworkingBlocked and isUidRestrictedOnMeteredNetworks
  Add multipath preference, background status API
 2021-03-18 14:07:12 +00:00
Lucas Lin
7d2c52067f Merge "Expose systemReady for SystemServer" am: 33737f6ac4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640142

Change-Id: I4680cd76d6e5c074e291bddcf1bd4bd3871365a1
 2021-03-18 14:05:03 +00:00
Chiachang Wang
38794c5290 Merge changes from topic "replaceUidRange" am: 7b582e9749 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626206

Change-Id: I3d62d9c03ab6a418e23dd6c5e6f8317b7b375f9c
 2021-03-18 14:01:33 +00:00
Chiachang Wang
94e9fb339f Merge "Expose APIs for Settings" am: 53178361ae 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644202

Change-Id: Ia47e8efc3cc3f40b396c0aa0bd49afea2385e9c3
 2021-03-18 13:53:36 +00:00
Lorenzo Colitti
6ace66ed21 Merge "Add a VpnManager.TYPE_VPN_OEM." am: 96d66bb7b8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644265

Change-Id: Ie010e23484d9ec7ad31631d72292cc52c96f2c10
 2021-03-18 13:50:18 +00:00
Lucas Lin
33737f6ac4 Merge "Expose systemReady for SystemServer" 2021-03-18 13:40:54 +00:00
Chiachang Wang
7b582e9749 Merge changes from topic "replaceUidRange" 
* changes:
  Expose uids related APIs in NetworkRequest and NetworkCapabilities
  Replace the usage of UidRange
 2021-03-18 13:36:39 +00:00
Chalard Jean
4c83d1509c Merge "Address remaining comments on aosp/1607893" am: 08b0411d4f am: ec138734a7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640140

Change-Id: Ib54802430fc785ac4cf6094c42c26bb654b361df
 2021-03-18 13:31:33 +00:00
Chalard Jean
80e68e5d1d Merge "Move constants to MODULE_LIB" am: 229cf59510 am: 39356af73f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640141

Change-Id: Ifc5436f5729ffcc40d069bfc649091d2b8821a0e
 2021-03-18 13:31:10 +00:00
Paul Hu
82227141f6 Merge "Add more connectivity module settings" am: 9abe34a466 am: 88d4fc79df 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1641784

Change-Id: I269802c5a036181e9eaf90862dbf50b66610f78d
 2021-03-18 13:30:33 +00:00
Chiachang Wang
53178361ae Merge "Expose APIs for Settings" 2021-03-18 13:27:47 +00:00
Lorenzo Colitti
96d66bb7b8 Merge "Add a VpnManager.TYPE_VPN_OEM." 2021-03-18 13:12:08 +00:00
Chalard Jean
ec138734a7 Merge "Address remaining comments on aosp/1607893" am: 08b0411d4f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640140

Change-Id: I49b1ea7e3461ef0cad563d5d7933b5535f94d08c
 2021-03-18 12:59:06 +00:00
Chalard Jean
39356af73f Merge "Move constants to MODULE_LIB" am: 229cf59510 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640141

Change-Id: Ib22b9f3223af2cfe51438e2e19584ec089a4e9d2
 2021-03-18 12:55:57 +00:00
Paul Hu
88d4fc79df Merge "Add more connectivity module settings" am: 9abe34a466 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1641784

Change-Id: If6fab011720145f2ba18df478e6660be442bcad5
 2021-03-18 12:53:52 +00:00
Chalard Jean
08b0411d4f Merge "Address remaining comments on aosp/1607893" 2021-03-18 12:30:14 +00:00
Chalard Jean
4de6088dc9 Address remaining comments on aosp/1607893 
Test: ConnectivityServiceTest
Change-Id: Icf70b20624604bfade37804311a77ef6be564c09
 2021-03-18 12:30:00 +00:00
Chalard Jean
229cf59510 Merge "Move constants to MODULE_LIB" 2021-03-18 12:29:38 +00:00
Paul Hu
9abe34a466 Merge "Add more connectivity module settings" 2021-03-18 12:22:55 +00:00
Remi NGUYEN VAN
523df86f2d Merge changes I77a3efca,I2c4a37ff into sc-dev 
* changes:
  Migrate framework-connectivity internal resources
  Add connectivity protos to framework-connectivity
 2021-03-18 11:16:25 +00:00
Sudheer Shanka
cc8f26dea8 Add an API to listen for changes in network blocked status of an uid. 
Given that ConnectivityService is moving to a mainline module, we need
a @SystemApi for it to listen for changes in blocked status of an uid.
So, we decided to create a new API for this which can provide
ConnectivityService with more info about why an uid is blocked (which
will be useful for adding a new similar onBlockedStatusChanged callback
in CM.NetworkCallback) and also captures data saver restriction without
having out to track it separately.

Currently, NPMS does some redundant computations because we are
calculating both uid rules and blocked reasons separately. In a
follow-up change, we will compute uid rules using blocked reasons
and later possibly remove that onUidRulesChanged callback.

Bug: 176289731
Test: atest ./tests/cts/hostside/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
Test: atest ./tests/net/java/com/android/server/ConnectivityServiceTest.java
Test: atest ./services/tests/servicestests/src/com/android/server/net/NetworkPolicyManagerServiceTest.java
Change-Id: Ib9949b8619c6b148f73630b314c4113d76c31ec1
Merged-In: Ib9949b8619c6b148f73630b314c4113d76c31ec1
 2021-03-18 10:42:25 +00:00
Remi NGUYEN VAN
35980c9453 [automerger skipped] Remove extra comment am: b78337d701 am: 1405039ed2 -s ours 
am skip reason: skip tag Change-Id I0c0daa91ef272a19c548cf55eb2f764c95f8f844 with SHA-1 e589e021dd is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13906655

Change-Id: Ia8523fc8557bea3d9635d23472e4301e9b43fde5
 2021-03-18 10:42:10 +00:00
Remi NGUYEN VAN
1405039ed2 Remove extra comment am: b78337d701 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13906655

Change-Id: Ia86521977e1064f58651bbdb068211a7929c2cfd
 2021-03-18 10:36:45 +00:00