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

Merge "Allow USE_RESTRICTED_NETWORKS for registerSystemDefaultNetworkCallback"

Browse Source
This commit is contained in:
Treehugger Robot
2022-11-09 05:49:54 +00:00
committed by Gerrit Code Review
parent 5c70002069 aa4ad8c2d1
commit 31ee1c1121
5 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5181,9 +5181,10 @@ public class ConnectivityServiceTest {
}
@Test
public void testRegisterPrivilegedDefaultCallbacksRequireNetworkSettings() throws Exception {
public void testRegisterPrivilegedDefaultCallbacksRequirePermissions() throws Exception {
mCellNetworkAgent = new TestNetworkAgentWrapper(TRANSPORT_CELLULAR);
mCellNetworkAgent.connect(false /* validated */);
mServiceContext.setPermission(CONNECTIVITY_USE_RESTRICTED_NETWORKS, PERMISSION_DENIED);
final Handler handler = new Handler(ConnectivityThread.getInstanceLooper());
final TestNetworkCallback callback = new TestNetworkCallback();
@@ -5194,6 +5195,12 @@ public class ConnectivityServiceTest {
() -> mCm.registerDefaultNetworkCallbackForUid(APP1_UID, callback, handler));
callback.assertNoCallback();
mServiceContext.setPermission(CONNECTIVITY_USE_RESTRICTED_NETWORKS, PERMISSION_GRANTED);
mCm.registerSystemDefaultNetworkCallback(callback, handler);
mServiceContext.setPermission(CONNECTIVITY_USE_RESTRICTED_NETWORKS, PERMISSION_DENIED);
callback.expectAvailableCallbacksUnvalidated(mCellNetworkAgent);
mCm.unregisterNetworkCallback(callback);
mServiceContext.setPermission(NETWORK_SETTINGS, PERMISSION_GRANTED);
mCm.registerSystemDefaultNetworkCallback(callback, handler);
callback.expectAvailableCallbacksUnvalidated(mCellNetworkAgent);