summaryrefslogtreecommitdiff
path: root/tests/net/java/com/android/server
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge "Add session ID to VpnTransportInfo" into sc-devLorenzo Colitti2021-03-301-1/+3
|\ \ \ \ \ \
| * | | | | | Add session ID to VpnTransportInfolifr2021-03-291-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - This will be visible only to apps with the NETWORK_SETTINGS permissions (signature), and will be redacted for all other callers. - This string is expected to be the same as set by VpnService#setSession, and in general, VpnConfig.session. But it will be a general API that Vpn.java can call when setting the VpnTransportInfo. - This string cannot be updated once the VPN NetworkAgent is connected. Bug: 171872481 Test: atest ConnectivityServiceTest atest VpnTransportInfoTest atest android.net.cts.NetworkAgentTest Change-Id: I8d09e25b83f7ee8be21ec9c9bd3c72a251f1370d
* | | | | | | Merge "Remove NetworkPolicyManager.isUidBlocked() API." am: 9cff99d059 am: ↵Sudheer Shanka2021-03-291-1/+13
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | / | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | 433c866186 am: 4b3348f115 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652550 Change-Id: Ic5c9fb2603a010976bc93e5059e5548ee782005e
| * | | | | Remove NetworkPolicyManager.isUidBlocked() API.Sudheer Shanka2021-03-291-1/+13
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It isn't used by ConnectivityService any more and even if it needs such utility method in the future, we could create one which is part of connectivity module and doesn't need to be exposed as part of NetworkPolicyManager API surface. Bug: 183696103 Test: atest ./tests/net/java/com/android/server/ConnectivityServiceTest.java Change-Id: Ie3c681f88e4b2b9bb92d2224c5ea96b074f155d5
* | | | | Merge "Support Dual ViLTE stats" am: e456a6c3f8 am: dfcdeef584 am: a62eb108faJunyu Lai2021-03-291-0/+86
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540920 Change-Id: I5739265c2747055b0252da7d1fb9e47d61ca111c
| * | | | Merge "Support Dual ViLTE stats"Junyu Lai2021-03-291-0/+86
| |\ \ \ \
| | * | | | Support Dual ViLTE statsZhengyu Zhan2021-03-151-0/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some operator supports multiple VILTE, both two SIM cards can make VILTE call. We need to record VILTE data to different interface. Now NetworkStatsService has only one VILTE data interface: "vt_data0". All VILTE data stats will be recorded in this interface. Bug: 130871087 Test: NetworkStatsServiceTest#testDualVilteProviderStats Change-Id: I000ec756827bc42cac88dd0a2ca6b7999252357e
| * | | | | Merge "Re-implement NetworkUtils#queryUserAccess."Remi NGUYEN VAN2021-03-291-1/+1
| |\ \ \ \ \
| | * | | | | Re-implement NetworkUtils#queryUserAccess.Lorenzo Colitti2021-03-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, queryUserAccess talks to netd via FwmarkServer. Doing this from the module would require exposing queryUserAccess as an NDK API or reimplementing FwmarkClient. Because queryUserAccess really only uses information that comes from ConnectivityService/PermissionMonitor anyway, just use that information without calling to net. Test: atest HostsideVpnTests Bug: 171540887 Merged-In: If855de1ea3e1fd2ed30f2795d9b4acfcf969a2dc Change-Id: If855de1ea3e1fd2ed30f2795d9b4acfcf969a2dc
* | | | | | | Merge changes from topic "blocked-reasons-callback-tests" am: 2108a92452 am: ↵Lorenzo Colitti2021-03-261-2/+41
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6456359a0e am: 8afa9811c7 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652214 Change-Id: I4d69b1ce096d83c311620950650460024ae348c0
| * | | | | | Add unit tests for onBlockedStatusChanged(Network, int).Lorenzo Colitti2021-03-261-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 165835257 Test: atest FrameworksNetTests Change-Id: I0597df71aa94817835d7a2fb54bfcf9222a34b64
| * | | | | | Add onBlockedStatusChanged(Network, int) to NetworkCallback.Lorenzo Colitti2021-03-261-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is similar to onBlockedStatusChanged(Network, boolean) but it allows the callback holder to know the exact reason why networking was blocked. It is useful to privileged system components such as JobScheduler that are able to ignore some blocked reasons but not others. Also add a new BLOCKED_REASON_LOCKDOWN_VPN that is used when networking is blocked because an always-on VPN is in lockdown mode. Also move BLOCKED_METERED_REASON_MASK to ConnectivityManager. This is necessary because ConnectivityService must ensure that the blocked status callbacks are correctly sent when meteredness changes (e.g., a UID that is blocked on metered networks will become unblocked on a network that becomes unmetered). In order to do this it needs to know which reasons apply only on metered networks. Bug: 165835257 Test: unit tests in subsequent CLs in the stack Change-Id: I647db4f5a01280be220288e73ffa85c15bec9370
| * | | | | | Merge "Add annotation for Vpn#getNetwork()"Lucas Lin2021-03-251-10/+6
| |\ \ \ \ \ \
| | * | | | | | Add annotation for Vpn#getNetwork()lucaslin2021-03-251-10/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add @VisibleForTesting & @Nullable for Vpn#getNetwork(). - Remove null check in caller side(test) of Vpn#getNetwork() because if the code is working properly, it can never be null. Bug: 182963397 Test: atest FrameworksNetTests Change-Id: Ic52864003fbebd9f4e95d43fefc2e168437b0122 Merged-In: Ic52864003fbebd9f4e95d43fefc2e168437b0122 (cherry-picked from ag/13946573)
| * | | | | | | Merge "Remove the usage of NETID_UNSET from Vpn.java"Lucas Lin2021-03-251-9/+9
| |\| | | | | |
| | * | | | | | Remove the usage of NETID_UNSET from Vpn.javalucaslin2021-03-251-9/+9
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modify Vpn#getNetId() to Vpn#getNetwork() and uses NETID_UNSET when getNetwork() returns null in ConnectivityServiceTest. Bug: 182963397 Test: atest FrameworksNetTests Change-Id: I69d449705b1dc541287c72af8dc7705dc4733109 Merged-In: I69d449705b1dc541287c72af8dc7705dc4733109 (cherry-picked from ag/13927650)
* | | | | | | [NS06] Implement the don't-reap mechanismChalard Jean2021-03-253-5/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This exposes a mechanism for network providers to tell the network stack that a given network must be kept up for some specific reason. This is meant to be easier for them than to have to file a request, in particular because there is no guaranteed way to make sure the request will be best matched by any given network. Test: new test for this Bug: 167544279 Change-Id: I238a3ee5ee9262477a23b897e4141769dd1505d1
* | | | | | | [NS05] Feed network offer callbacksChalard Jean2021-03-252-93/+360
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The design is very simply expressed : An offer is needed for a request if and only if that offer might beat the satisfier for that request. The implementation of "might beat" is NetworkRanker#mightBeat. Test: FrameworksNetTests FrameworksWifiTests NetworkStackTests Bug: 167544279 Change-Id: I0fe911eef2483ecbac48c733d56283b81538690a
* | | | | | | Merge "Add static for constant" into sc-devLucas Lin2021-03-252-6/+6
|\ \ \ \ \ \ \
| * | | | | | | Add static for constantlucaslin2021-03-242-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 182963397 Test: atest IpConnectivityMetricsTest Test: atest NetdEventListenerServiceTest Change-Id: I3826b9efc3418a724bd3753b9ad573adc3343b72
* | | | | | | | Merge "Add 5G/NR QOS support" am: bd3a33ed9f am: 3e7751c427 am: 80f11bb5bbJayachandran Chinnakkannu2021-03-241-1/+32
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1643762 Change-Id: I74c0d7d771d0b7e067dddc582389f77b8a899542
| * | | | | | | Merge "Add 5G/NR QOS support"Jayachandran Chinnakkannu2021-03-241-1/+32
| |\ \ \ \ \ \ \
| | * | | | | | | Add 5G/NR QOS supportJayachandran C2021-03-231-1/+32
| | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 155176305 Bug: 182317794 Test: atest ConnectivityServiceTest atest QosCallbackTrackerTest Change-Id: Idf6d8a7c3b80bc50a2c1244ceaefea9381d40c2f
| * / | | | | | Move BLOCKED_REASON_* constants from NPMS into ConnectivityManager.Sudheer Shanka2021-03-251-4/+4
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These constants will now be including all the reasons for why an uid's network access can be blocked, instead of only the restrictions that could be imposed by NPMS. Bug: 183473548 Test: atest ./tests/cts/hostside/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java Merged-In: I4c544415e12adf442fd2415c371b1b70a39c3aa4 Change-Id: I6dcea43fbefa9eac8b5a971b822a5be5422a54b4
* | | | | | | Merge "Move BLOCKED_REASON_* constants from NPMS into ConnectivityManager." ↵TreeHugger Robot2021-03-241-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into sc-dev
| * | | | | | | Move BLOCKED_REASON_* constants from NPMS into ConnectivityManager.Sudheer Shanka2021-03-231-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These constants will now be including all the reasons for why an uid's network access can be blocked, instead of only the restrictions that could be imposed by NPMS. Bug: 183473548 Test: atest ./tests/cts/hostside/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java Ignore-AOSP-First: Merging internally first to handle conflicts. Change-Id: I4c544415e12adf442fd2415c371b1b70a39c3aa4
* | | | | | | | Merge "Add annotation for Vpn#getNetwork()" into sc-devLucas Lin2021-03-241-10/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Add annotation for Vpn#getNetwork()lucaslin2021-03-221-10/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add @VisibleForTesting & @Nullable for Vpn#getNetwork(). - Remove null check in caller side(test) of Vpn#getNetwork() because if the code is working properly, it can never be null. Bug: 182963397 Test: atest FrameworksNetTests Change-Id: Ic52864003fbebd9f4e95d43fefc2e168437b0122
* | | | | | | | | Merge "Re-implement NetworkUtils#queryUserAccess." into sc-devRemi NGUYEN VAN2021-03-241-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Re-implement NetworkUtils#queryUserAccess.Lorenzo Colitti2021-03-231-1/+1
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, queryUserAccess talks to netd via FwmarkServer. Doing this from the module would require exposing queryUserAccess as an NDK API or reimplementing FwmarkClient. Because queryUserAccess really only uses information that comes from ConnectivityService/PermissionMonitor anyway, just use that information without calling to net. Test: atest HostsideVpnTests Bug: 171540887 Change-Id: If855de1ea3e1fd2ed30f2795d9b4acfcf969a2dc
* | | | | | | | Merge "Get NetworkCapabilities from NetworkCallback" into sc-devLucas Lin2021-03-242-19/+40
|\ \ \ \ \ \ \ \
| * | | | | | | | Get NetworkCapabilities from NetworkCallbacklucaslin2021-03-232-19/+40
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Register network callback for all networks and record NetworkCapabilities for every networks. Once onDnsEvent is triggered, use the netId it passes in to find the corresponding NetworkCapabilities instead of using netId to create a Network object(hidden API) then get the NetworkCapabilities by ConnectivityManager#getNetworkCapabilities. Bug: 182963397 Test: m Test: atest IpConnectivityMetricsTest Test: atest NetdEventListenerServiceTest Change-Id: I91d68ca33253831b78def1ddeb074ba944a5d6ad
* | | | | | | | Merge "Remove Notification.DevFlags" into sc-devJeff DeCew2021-03-231-13/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove Notification.DevFlagsJeff DeCew2021-03-231-13/+0
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: 176239013 Test: manual Change-Id: I1aeed1c79e4a829d8829eb08224f9b21fafc50fe
* | | | | | | | Merge changes I638ed5cd,I29f15571,I21a22ed1 am: 892589c514 am: 3df38d48ae ↵Lorenzo Colitti2021-03-231-8/+81
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | / / / / | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | am: 114c3e3038 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1648068 Change-Id: I6d897cdcfb5b0e4809a32312071eb77623754f94
| * | | | | | Support calling registerDefaultNetworkCallback for another UID.Lorenzo Colitti2021-03-221-8/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to be used by privileged components (e.g., JobScheduler) to request callbacks about the state of other UIDs on the system. Bug: 165835257 Test: new unit test coverage Change-Id: I29f155710394e58c14fcef488db6271d8d83033a
* | | | | | | Remove NetdService, NetworkStackClient dependencyRemi NGUYEN VAN2021-03-231-2/+2
| |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Netd should be obtained via getSystemService, and ModuleNetworkStackClient must be used instead of NetworkStackClient for modules. Bug: 171540887 Test: m Change-Id: Ibe703ac56dd70673115cd8b95b44b856a7fc01f3
* | | | | | Merge changes I90bf7957,If58524b0 am: 7a2f9c06ca am: 3042783816 am: 3c975c208fLorenzo Colitti2021-03-221-0/+16
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646972 Change-Id: I0420784d706f64b05137074bfcfb58cdc232b83b
| * | | | | Merge changes I90bf7957,If58524b0 am: 7a2f9c06caLorenzo Colitti2021-03-221-0/+16
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646972 Change-Id: I1c3de9d738a294e9d21314de84384fa89745285d
| | * | | | Fix privileged apps calling registerDefaultNetworkCallback.Lorenzo Colitti2021-03-221-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When registerDefaultNetworkCallback is called by an app that has NETWORK_SETTINGS, the UID of the app is forgotten and the request that is filed has an empty UID set. This results in that request matching networks that have UID ranges that do not include it, e.g., VPNs. Fix this by ensuring that the UID ranges are properly set. Bug: 165835257 Test: updated specific tests for this bug Change-Id: I90bf79573342c144d1cfbc2f61a3155fdd5b1fa7
| | * | | | Test a bug with NETWORK_SETTINGS+registerDefaultNetworkCallback.Lorenzo Colitti2021-03-221-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, if a process with NETWORK_SETTINGS registers a default network callback, its uid will be ignored and replaced with an empty list of UIDs. This means it will incorrectly match VPNs with any UID range. Add a test for this bug to make it easier to review the upcoming change that fixes it. Bug: 165835257 Test: test-only change Change-Id: If58524b01fdd60045fb7236d17dedf31fb563f99
| * | | | | resolve merge conflicts of 403b7fd0b0a6736bcee1817fb5c774f8c8a040de to ↵Roshan Pius2021-03-211-36/+223
| |\| | | | | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master Merged-In: Ib9d7923104ac0a60f6af5a3a2d2b7f13bc0262e3 Change-Id: Ib9d7923104ac0a60f6af5a3a2d2b7f13bc0262e3
| | * | | Merge changes from topics ↵Treehugger Robot2021-03-212-121/+331
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "revert-1645768-revert-1626206-replaceUidRange-MSYTKFNGUE-HIUTVTIGIR", "ti_redaction" * changes: TransportInfo: Add a generic redaction mechanism Revert "Revert "Expose uids related APIs in NetworkRequest and N..." Revert^2 "Replace the usage of UidRange"
| | * | | TransportInfo: Add a generic redaction mechanismRoshan Pius2021-03-191-36/+223
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This replaces the existing mechanism for redacting location sensitive fields with a more extensible mechanism. Currently supported redactions are for the following permissions: i. ACCESS_FINE_LOCATION ii. LOCAL_MAC_ADDRESS iii. NETWORK_SETTINGS Also, removed WifiInfo from ConnectivityServiceTest to reduce cross dependencies on wifi code. Bug: 156867433 Bug: 162602799 Test: atest android.net Test: atest com.android.server Change-Id: I2bb980c624667a55c1383f13ab71b9b97ed6eeab
| | * | | Revert^2 "Replace the usage of UidRange"Chiachang Wang2021-03-192-85/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5b7aad6995711879823b6a035792b13c5cc06f59 UidRange is used in a shared way between ConnectivityService and VPN through the use of NetworkCapabilities. UidRange will be part of the ConnectivityService mainline but Vpn.java will stay in the framework. We need a way to replace the APIs using UidRange, or to make UidRange system API. The only really relevant surface here is NetworkCapabilities#{setUids, getUids}. The need for UidRange could be replaced by an integer Range, so replace the usage of UidRange by a integer Range in NetworkCapabilities#{setUids, getUids} and update the relevant callers. Bug: 172183305 Test: atest FrameworksNetTests CtsNetTestCasesLatestSdk Change-Id: I0f679fb5fb8f4fe26461ca4912ca1fdfe7f43c9e Merged-In: I4e5aec6ef1ea02e038fcd7ed117a3b67b69c5cb9
| * | | | Use module resources in NetworkNotificationManager.Lorenzo Colitti2021-03-212-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also make getTransportName non-static so it can access the module resources. Also fix a duplicate comment in a resource file. Bug: 183097033 Test: atest FrameworksNetTests Test: connected to Wi-Fi with no Internet, observed notification Change-Id: Ic0d24d36af0b87153d527083f8964ddc6cd78482 Merged-In: Ic0d24d36af0b87153d527083f8964ddc6cd78482
| * | | | Cherry-pick some test changes from ag/13210542.Lorenzo Colitti2021-03-211-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ag/13210542 switched from using reset() on mResources to using clearInvocations(). This ensures that only the previous calls are reset, and that the mock continues to behave according to what was specified in setUp. Test: 183097033 Test: test-only change Merged-In: I35d28c8df341dbbac2774026c6ca749e296c0482 Change-Id: Ieef982d2df50db3014f35f58a77674939ebe0d43
| * | | | Remove unused NetworkPolicyManagerInternal in CSpaulhu2021-03-201-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ConnectivityService doesn't call any NPMI methods, so remove all usage from CS. Bug: 170598012 Test: atest FrameworksNetTests Test: atest FrameworksNetIntegrationTests Change-Id: I8719ef2e96e7db9da2894b467b9e7a1bc09de386 Merged-In: I8719ef2e96e7db9da2894b467b9e7a1bc09de386
| * | | | Migrate framework-connectivity internal resourcesRemi NGUYEN VAN2021-03-201-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use ServiceConnectivityResources instead. Start by creating resources in the ServiceConnectivityResources package to match the internal configuration, and common overlays. Bug: 182125649 Test: device boots, has connectivity Change-Id: I77a3efca2cd644f9828db1ed5d3cae8070fb8363 Merged-In: I77a3efca2cd644f9828db1ed5d3cae8070fb8363
* | | | | Merge "Remove the usage of NETID_UNSET from Vpn.java" into sc-devLucas Lin2021-03-221-9/+9
|\ \ \ \ \