Merge "ConnectivityManager: Address review comments from aosp/1595396" am:... (2c862461) · Commits · e / os / android_frameworks_base

packages/Connectivity/framework/src/android/net/ConnectivityManager.java

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -3475,6 +3475,8 @@ public class ConnectivityManager {
	* not include location sensitive info.		* not include location sensitive info.
	* </p>		* </p>
	*/		*/
			// Note: Some existing fields which are location sensitive may still be included without
			// this flag if the app targets SDK < S (to maintain backwards compatibility).
	public static final int FLAG_INCLUDE_LOCATION_INFO = 1 << 0;		public static final int FLAG_INCLUDE_LOCATION_INFO = 1 << 0;

	/** @hide */		/** @hide */

packages/Connectivity/framework/src/android/net/NetworkCapabilities.java

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1126,7 +1126,9 @@ public final class NetworkCapabilities implements Parcelable {
	* app needs to hold {@link android.Manifest.permission#ACCESS_FINE_LOCATION} permission. If the		* app needs to hold {@link android.Manifest.permission#ACCESS_FINE_LOCATION} permission. If the
	* app targets SDK version greater than or equal to {@link Build.VERSION_CODES#S}, then they		* app targets SDK version greater than or equal to {@link Build.VERSION_CODES#S}, then they
	* also need to use {@link NetworkCallback#FLAG_INCLUDE_LOCATION_INFO} to get the info in their		* also need to use {@link NetworkCallback#FLAG_INCLUDE_LOCATION_INFO} to get the info in their
	* callback. The app will be blamed for location access if this field is included.		* callback. If the apps targets SDK version equal to {{@link Build.VERSION_CODES#R}, this field
			* will always be included. The app will be blamed for location access if this field is
			* included.
	* </p>		* </p>
	*/		*/
	public int getOwnerUid() {		public int getOwnerUid() {

tests/net/java/com/android/server/ConnectivityServiceTest.java

+33 −52

Original line number	Original line	Diff line number	Diff line
	@@ -9251,7 +9251,7 @@ public class ConnectivityServiceTest {

	final int expectedOwnerUidWithoutIncludeFlag =		final int expectedOwnerUidWithoutIncludeFlag =
	shouldInclLocationSensitiveOwnerUidWithoutIncludeFlag		shouldInclLocationSensitiveOwnerUidWithoutIncludeFlag
	? Process.myUid() : INVALID_UID;		? myUid : INVALID_UID;
	assertEquals(expectedOwnerUidWithoutIncludeFlag, getOwnerUidNetCapsPermission(		assertEquals(expectedOwnerUidWithoutIncludeFlag, getOwnerUidNetCapsPermission(
	myUid, myUid, false /* includeLocationSensitiveInfo */));		myUid, myUid, false /* includeLocationSensitiveInfo */));

	@@ -9270,40 +9270,35 @@ public class ConnectivityServiceTest {

	}		}

	@Test		private void verifyOwnerUidAndTransportInfoNetCapsPermissionPreS() {
	public void testCreateWithLocationInfoSanitizedWithFineLocationAfterQ()
	throws Exception {
	setupLocationPermissions(Build.VERSION_CODES.Q, true, AppOpsManager.OPSTR_FINE_LOCATION,
	Manifest.permission.ACCESS_FINE_LOCATION);

	verifyOwnerUidAndTransportInfoNetCapsPermission(		verifyOwnerUidAndTransportInfoNetCapsPermission(
	// Ensure that we include owner uid even if the request asks to remove it since the		// Ensure that owner uid is included even if the request asks to remove it (which is
	// app has necessary permissions and targetSdk < S.		// the default) since the app has necessary permissions and targetSdk < S.
	true, /* shouldInclLocationSensitiveOwnerUidWithoutIncludeFlag */		true, /* shouldInclLocationSensitiveOwnerUidWithoutIncludeFlag */
	true, /* shouldInclLocationSensitiveOwnerUidWithIncludeFlag */		true, /* shouldInclLocationSensitiveOwnerUidWithIncludeFlag */
	false, /* shouldInclLocationSensitiveTransportInfoWithoutIncludeFlag */		// Ensure that location info is removed if the request asks to remove it even if the
	// Ensure that we remove location info if the request asks to remove it even if the
	// app has necessary permissions.		// app has necessary permissions.
			false, /* shouldInclLocationSensitiveTransportInfoWithoutIncludeFlag */
	true /* shouldInclLocationSensitiveTransportInfoWithIncludeFlag */		true /* shouldInclLocationSensitiveTransportInfoWithIncludeFlag */
	);		);
	}		}

			@Test
			public void testCreateWithLocationInfoSanitizedWithFineLocationAfterQPreS()
			throws Exception {
			setupLocationPermissions(Build.VERSION_CODES.Q, true, AppOpsManager.OPSTR_FINE_LOCATION,
			Manifest.permission.ACCESS_FINE_LOCATION);

			verifyOwnerUidAndTransportInfoNetCapsPermissionPreS();
			}

	@Test		@Test
	public void testCreateWithLocationInfoSanitizedWithFineLocationPreSWithAndWithoutCallbackFlag()		public void testCreateWithLocationInfoSanitizedWithFineLocationPreSWithAndWithoutCallbackFlag()
	throws Exception {		throws Exception {
	setupLocationPermissions(Build.VERSION_CODES.R, true, AppOpsManager.OPSTR_FINE_LOCATION,		setupLocationPermissions(Build.VERSION_CODES.R, true, AppOpsManager.OPSTR_FINE_LOCATION,
	Manifest.permission.ACCESS_FINE_LOCATION);		Manifest.permission.ACCESS_FINE_LOCATION);

	verifyOwnerUidAndTransportInfoNetCapsPermission(		verifyOwnerUidAndTransportInfoNetCapsPermissionPreS();
	// Ensure that we include owner uid even if the request asks to remove it since the
	// app has necessary permissions and targetSdk < S.
	true, /* shouldInclLocationSensitiveOwnerUidWithoutIncludeFlag */
	true, /* shouldInclLocationSensitiveOwnerUidWithIncludeFlag */
	false, /* shouldInclLocationSensitiveTransportInfoWithoutIncludeFlag */
	// Ensure that we remove location info if the request asks to remove it even if the
	// app has necessary permissions.
	true /* shouldInclLocationSensitiveTransportInfoWithIncludeFlag */
	);
	}		}

	@Test		@Test
	@@ -9314,13 +9309,13 @@ public class ConnectivityServiceTest {
	Manifest.permission.ACCESS_FINE_LOCATION);		Manifest.permission.ACCESS_FINE_LOCATION);

	verifyOwnerUidAndTransportInfoNetCapsPermission(		verifyOwnerUidAndTransportInfoNetCapsPermission(
	// Ensure that we owner UID if the request asks us to remove it even if the app		// Ensure that the owner UID is removed if the request asks us to remove it even
	// has necessary permissions since targetSdk >= S.		// if the app has necessary permissions since targetSdk >= S.
	false, /* shouldInclLocationSensitiveOwnerUidWithoutIncludeFlag */		false, /* shouldInclLocationSensitiveOwnerUidWithoutIncludeFlag */
	true, /* shouldInclLocationSensitiveOwnerUidWithIncludeFlag */		true, /* shouldInclLocationSensitiveOwnerUidWithIncludeFlag */
	false, /* shouldInclLocationSensitiveTransportInfoWithoutIncludeFlag */		// Ensure that location info is removed if the request asks to remove it even if the
	// Ensure that we remove location info if the request asks to remove it even if the
	// app has necessary permissions.		// app has necessary permissions.
			false, /* shouldInclLocationSensitiveTransportInfoWithoutIncludeFlag */
	true /* shouldInclLocationSensitiveTransportInfoWithIncludeFlag */		true /* shouldInclLocationSensitiveTransportInfoWithIncludeFlag */
	);		);
	}		}
	@@ -9331,15 +9326,15 @@ public class ConnectivityServiceTest {
	setupLocationPermissions(Build.VERSION_CODES.P, true, AppOpsManager.OPSTR_COARSE_LOCATION,		setupLocationPermissions(Build.VERSION_CODES.P, true, AppOpsManager.OPSTR_COARSE_LOCATION,
	Manifest.permission.ACCESS_COARSE_LOCATION);		Manifest.permission.ACCESS_COARSE_LOCATION);

			verifyOwnerUidAndTransportInfoNetCapsPermissionPreS();
			}

			private void verifyOwnerUidAndTransportInfoNetCapsNotIncluded() {
	verifyOwnerUidAndTransportInfoNetCapsPermission(		verifyOwnerUidAndTransportInfoNetCapsPermission(
	// Ensure that we owner UID if the request asks us to remove it even if the app		false, /* shouldInclLocationSensitiveOwnerUidWithoutIncludeFlag */
	// has necessary permissions since targetSdk >= S.		false, /* shouldInclLocationSensitiveOwnerUidWithIncludeFlag */
	true, /* shouldInclLocationSensitiveOwnerUidWithoutIncludeFlag */
	true, /* shouldInclLocationSensitiveOwnerUidWithIncludeFlag */
	false, /* shouldInclLocationSensitiveTransportInfoWithoutIncludeFlag */		false, /* shouldInclLocationSensitiveTransportInfoWithoutIncludeFlag */
	// Ensure that we remove location info if the request asks to remove it even if the		false /* shouldInclLocationSensitiveTransportInfoWithIncludeFlag */
	// app has necessary permissions.
	true /* shouldInclLocationSensitiveTransportInfoWithIncludeFlag */
	);		);
	}		}

	@@ -9349,12 +9344,7 @@ public class ConnectivityServiceTest {
	setupLocationPermissions(Build.VERSION_CODES.Q, false, AppOpsManager.OPSTR_FINE_LOCATION,		setupLocationPermissions(Build.VERSION_CODES.Q, false, AppOpsManager.OPSTR_FINE_LOCATION,
	Manifest.permission.ACCESS_FINE_LOCATION);		Manifest.permission.ACCESS_FINE_LOCATION);

	verifyOwnerUidAndTransportInfoNetCapsPermission(		verifyOwnerUidAndTransportInfoNetCapsNotIncluded();
	false, /* shouldInclLocationSensitiveOwnerUidWithoutIncludeFlag */
	false, /* shouldInclLocationSensitiveOwnerUidWithIncludeFlag */
	false, /* shouldInclLocationSensitiveTransportInfoWithoutIncludeFlag */
	false /* shouldInclLocationSensitiveTransportInfoWithIncludeFlag */
	);
	}		}

	@Test		@Test
	@@ -9376,26 +9366,17 @@ public class ConnectivityServiceTest {
	setupLocationPermissions(Build.VERSION_CODES.Q, true, AppOpsManager.OPSTR_COARSE_LOCATION,		setupLocationPermissions(Build.VERSION_CODES.Q, true, AppOpsManager.OPSTR_COARSE_LOCATION,
	Manifest.permission.ACCESS_COARSE_LOCATION);		Manifest.permission.ACCESS_COARSE_LOCATION);

	verifyOwnerUidAndTransportInfoNetCapsPermission(		verifyOwnerUidAndTransportInfoNetCapsNotIncluded();
	false, /* shouldInclLocationSensitiveOwnerUidWithoutIncludeFlag */
	false, /* shouldInclLocationSensitiveOwnerUidWithIncludeFlag */
	false, /* shouldInclLocationSensitiveTransportInfoWithoutIncludeFlag */
	false /* shouldInclLocationSensitiveTransportInfoWithIncludeFlag */
	);
	}		}

	@Test		@Test
	public void testCreateWithLocationInfoSanitizedWithoutLocationPermission()		public void testCreateWithLocationInfoSanitizedWithCoarseLocationAfterS()
	throws Exception {		throws Exception {
	// Test that not having fine location permission leads to sanitization.		// Test that not having fine location permission leads to sanitization.
	setupLocationPermissions(Build.VERSION_CODES.Q, true, null /* op /, null / perm */);		setupLocationPermissions(Build.VERSION_CODES.S, true, AppOpsManager.OPSTR_COARSE_LOCATION,
			Manifest.permission.ACCESS_COARSE_LOCATION);

	verifyOwnerUidAndTransportInfoNetCapsPermission(		verifyOwnerUidAndTransportInfoNetCapsNotIncluded();
	false, /* shouldInclLocationSensitiveOwnerUidWithoutIncludeFlag */
	false, /* shouldInclLocationSensitiveOwnerUidWithIncludeFlag */
	false, /* shouldInclLocationSensitiveTransportInfoWithoutIncludeFlag */
	false /* shouldInclLocationSensitiveTransportInfoWithIncludeFlag */
	);
	}		}

	@Test		@Test

services/core/java/com/android/server/ConnectivityService.java

+1 −1

File changed.

Contains only whitespace changes.