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

Require location permission for ConnDiags WiFi only.

Browse Source 
This CL updates ConnectivityDiagnostics permission checks in
ConnectivityService to only require location permission for Networks
that have TRANSPORT_WIFI. This change is consistent with the location
restrictions required for the transports themselves. Previously,
location permissions were required for all Network types.

Bug: 187310575
Test: atest ConnectivityServiceTest ConnectivityDiagnosticsManagerTest
Change-Id: I48806533e4e705d2d9be45f3b3d3931d9294b167
This commit is contained in:
Cody Kesting
2021-05-11 14:22:40 -07:00
parent fc592e8bc0
commit 7474f67454
2 changed files with 50 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9719,10 +9719,24 @@ public class ConnectivityServiceTest {
}
public NetworkAgentInfo fakeMobileNai(NetworkCapabilities nc) {
final NetworkCapabilities cellNc = new NetworkCapabilities.Builder(nc)
.addTransportType(TRANSPORT_CELLULAR).build();
final NetworkInfo info = new NetworkInfo(TYPE_MOBILE, TelephonyManager.NETWORK_TYPE_LTE,
ConnectivityManager.getNetworkTypeName(TYPE_MOBILE),
TelephonyManager.getNetworkTypeName(TelephonyManager.NETWORK_TYPE_LTE));
return new NetworkAgentInfo(null, new Network(NET_ID), info, new LinkProperties(),
return fakeNai(cellNc, info);
}
private NetworkAgentInfo fakeWifiNai(NetworkCapabilities nc) {
final NetworkCapabilities wifiNc = new NetworkCapabilities.Builder(nc)
.addTransportType(TRANSPORT_WIFI).build();
final NetworkInfo info = new NetworkInfo(TYPE_WIFI, 0 /* subtype */,
ConnectivityManager.getNetworkTypeName(TYPE_WIFI), "" /* subtypeName */);
return fakeNai(wifiNc, info);
}
private NetworkAgentInfo fakeNai(NetworkCapabilities nc, NetworkInfo networkInfo) {
return new NetworkAgentInfo(null, new Network(NET_ID), networkInfo, new LinkProperties(),
nc, new NetworkScore.Builder().setLegacyInt(0).build(),
mServiceContext, null, new NetworkAgentConfig(), mService, null, null, 0,
INVALID_UID, mQosCallbackTracker, new ConnectivityService.Dependencies());
@@ -9747,7 +9761,7 @@ public class ConnectivityServiceTest {
final NetworkCapabilities nc = new NetworkCapabilities();
nc.setAdministratorUids(new int[] {wrongUid});
final NetworkAgentInfo naiWithUid = fakeMobileNai(nc);
final NetworkAgentInfo naiWithUid = fakeWifiNai(nc);
mServiceContext.setPermission(android.Manifest.permission.NETWORK_STACK, PERMISSION_DENIED);
@@ -9757,18 +9771,37 @@ public class ConnectivityServiceTest {
Process.myPid() + 1, wrongUid, naiWithUid, mContext.getOpPackageName()));
}
private void verifyConnectivityDiagnosticsPermissionsWithNetworkAgentInfo(
NetworkAgentInfo info, boolean expectPermission) {
mServiceContext.setPermission(android.Manifest.permission.NETWORK_STACK, PERMISSION_DENIED);
assertEquals(
"Unexpected ConnDiags permission",
expectPermission,
mService.checkConnectivityDiagnosticsPermissions(
Process.myPid(), Process.myUid(), info, mContext.getOpPackageName()));
}
@Test
public void testCheckConnectivityDiagnosticsPermissionsNoLocationPermission() throws Exception {
public void testCheckConnectivityDiagnosticsPermissionsCellularNoLocationPermission()
throws Exception {
final NetworkCapabilities nc = new NetworkCapabilities();
nc.setAdministratorUids(new int[] {Process.myUid()});
final NetworkAgentInfo naiWithUid = fakeMobileNai(nc);
mServiceContext.setPermission(android.Manifest.permission.NETWORK_STACK, PERMISSION_DENIED);
verifyConnectivityDiagnosticsPermissionsWithNetworkAgentInfo(naiWithUid,
true /* expectPermission */);
}
assertFalse(
"ACCESS_FINE_LOCATION permission necessary for Connectivity Diagnostics",
mService.checkConnectivityDiagnosticsPermissions(
Process.myPid(), Process.myUid(), naiWithUid, mContext.getOpPackageName()));
@Test
public void testCheckConnectivityDiagnosticsPermissionsWifiNoLocationPermission()
throws Exception {
final NetworkCapabilities nc = new NetworkCapabilities();
nc.setAdministratorUids(new int[] {Process.myUid()});
final NetworkAgentInfo naiWithUid = fakeWifiNai(nc);
verifyConnectivityDiagnosticsPermissionsWithNetworkAgentInfo(naiWithUid,
false /* expectPermission */);
}
@Test