Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use FakePermissionEnforcer for NetworkManagementServiceTest" into udc-dev

Browse Source
This commit is contained in:
Thiébaud Weksteen
2023-04-27 08:46:32 +00:00
committed by Android (Google) Code Review
parent 76f56a4e68 28859ee741
commit 0ac26d4d5e
1 changed files with 7 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
services/tests/servicestests/src/com/android/server/net/NetworkManagementServiceTest.java
View File

@@ -37,7 +37,6 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.verifyNoMoreInteractions;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.content.AttributionSource;
import android.content.Context; import android.content.Context;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.INetd; import android.net.INetd;
@@ -50,7 +49,7 @@ import android.os.IBinder;
import android.os.PermissionEnforcer; import android.os.PermissionEnforcer;
import android.os.Process; import android.os.Process;
import android.os.RemoteException; import android.os.RemoteException;
import android.permission.PermissionCheckerManager; import android.os.test.FakePermissionEnforcer;
import android.platform.test.annotations.Presubmit; import android.platform.test.annotations.Presubmit;
import android.test.suitebuilder.annotation.SmallTest; import android.test.suitebuilder.annotation.SmallTest;
import android.util.ArrayMap; import android.util.ArrayMap;
@@ -90,7 +89,6 @@ public class NetworkManagementServiceTest {
private ArgumentCaptor<INetdUnsolicitedEventListener> mUnsolListenerCaptor; private ArgumentCaptor<INetdUnsolicitedEventListener> mUnsolListenerCaptor;
private final MockDependencies mDeps = new MockDependencies(); private final MockDependencies mDeps = new MockDependencies();
private final MockPermissionEnforcer mPermissionEnforcer = new MockPermissionEnforcer();
private final class MockDependencies extends NetworkManagementService.Dependencies { private final class MockDependencies extends NetworkManagementService.Dependencies {
@Override @Override
@@ -118,24 +116,6 @@ public class NetworkManagementServiceTest {
} }
} }
private static final class MockPermissionEnforcer extends PermissionEnforcer {
@Override
protected int checkPermission(@NonNull String permission,
@NonNull AttributionSource source) {
String[] granted = new String [] {
android.Manifest.permission.NETWORK_SETTINGS,
android.Manifest.permission.OBSERVE_NETWORK_POLICY,
android.Manifest.permission.SHUTDOWN
};
for (String p : granted) {
if (p.equals(permission)) {
return PermissionCheckerManager.PERMISSION_GRANTED;
}
}
return PermissionCheckerManager.PERMISSION_HARD_DENIED;
}
}
@Before @Before
public void setUp() throws Exception { public void setUp() throws Exception {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
@@ -145,12 +125,15 @@ public class NetworkManagementServiceTest {
eq(ConnectivityManager.class)); eq(ConnectivityManager.class));
doReturn(mCm).when(mContext).getSystemService(eq(Context.CONNECTIVITY_SERVICE)); doReturn(mCm).when(mContext).getSystemService(eq(Context.CONNECTIVITY_SERVICE));
// The AIDL stub will use PermissionEnforcer to check permission from the caller. // The AIDL stub will use PermissionEnforcer to check permission from the caller.
// Mock the service. See MockPermissionEnforcer above. // Mock the service and grant the expected permissions.
FakePermissionEnforcer permissionEnforcer = new FakePermissionEnforcer();
permissionEnforcer.grant(android.Manifest.permission.NETWORK_SETTINGS);
permissionEnforcer.grant(android.Manifest.permission.OBSERVE_NETWORK_POLICY);
permissionEnforcer.grant(android.Manifest.permission.SHUTDOWN);
doReturn(Context.PERMISSION_ENFORCER_SERVICE).when(mContext).getSystemServiceName( doReturn(Context.PERMISSION_ENFORCER_SERVICE).when(mContext).getSystemServiceName(
eq(PermissionEnforcer.class)); eq(PermissionEnforcer.class));
doReturn(mPermissionEnforcer).when(mContext).getSystemService( doReturn(permissionEnforcer).when(mContext).getSystemService(
eq(Context.PERMISSION_ENFORCER_SERVICE)); eq(Context.PERMISSION_ENFORCER_SERVICE));
// Start the service and wait until it connects to our socket. // Start the service and wait until it connects to our socket.
mNMService = NetworkManagementService.create(mContext, mDeps); mNMService = NetworkManagementService.create(mContext, mDeps);
} }