LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ensure nri is satisfied before returning.

Browse Source 
When a network preference is set, the highest priority nri will
be a managed default request that disallows default networking.
In the case where there is no satisfying network,
mNoServiceNetwork is used as the satisfier instead of null.
(see computeNetworkReassignment)

mNoServiceNetwork should not be returned in any public API.
Check for the nri being satisfied before returning the satisfier
to ensure mNoServiceNetwork is not returned.

Fixes: 301222648
Test: atest FrameworksNetTests
Change-Id: I22d67a7e8d0274d8ad4f6123fbedf6d37eed18e7
This commit is contained in:
Hansen Kurli
2023-09-07 16:26:02 +08:00
parent 48c14686a3
commit ed972a6fd2
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/unit/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -10230,9 +10230,8 @@ public class ConnectivityServiceTest {
// request so LOST callback is received.
defaultCallback.expect(LOST, mCellAgent);
// Due to the VPN default request, getActiveNetworkInfo() gets the mNoServiceNetwork
// as the network satisfier which has TYPE_NONE.
// TODO: This should not be TYPE_NONE, see ConnectivityManager#getActiveNetworkInfo
assertActiveNetworkInfo(TYPE_NONE, DetailedState.BLOCKED);
// as the network satisfier.
assertNull(mCm.getActiveNetworkInfo());
} else {
assertActiveNetworkInfo(TYPE_MOBILE, DetailedState.BLOCKED);
}
@@ -10314,9 +10313,8 @@ public class ConnectivityServiceTest {
// While the VPN is reconnecting on the new network, everything is blocked.
if (expectSetVpnDefaultForUids) {
// Due to the VPN default request, getActiveNetworkInfo() gets the mNoServiceNetwork
// as the network satisfier which has TYPE_NONE.
// TODO: This should not be TYPE_NONE, see ConnectivityManager#getActiveNetworkInfo
assertActiveNetworkInfo(TYPE_NONE, DetailedState.BLOCKED);
// as the network satisfier.
assertNull(mCm.getActiveNetworkInfo());
} else {
assertActiveNetworkInfo(TYPE_WIFI, DetailedState.BLOCKED);
}