joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

[connectivity] rename createWithLocationInfoSanitizedIfNecessaryWhenParceled

Browse source 
It's already redacting more sensitive information other than just
location info.

This is a follow up CL for https://googleplex-android-review.git.corp.google.com/c/platform/packages/modules/Connectivity/+/34224156/comment/98b93666_a824d7bc/

Bug: 374037595
Flag: EXEMPT PURE_REFACTOR
Change-Id: I6524c4f9ee9b5273e4ab421f54ae3115dea2cc8a
This commit is contained in:
Kangping Dong 2025-06-27 12:28:25 +08:00
commit 6fd0624452
3 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
framework/src/android/net/NetworkCapabilities.java
View file

@ -3566,7 +3566,7 @@ public final class NetworkCapabilities implements Parcelable {
* mainline version but deployed to older platforms which don't have those two
* NetworkSpecifier methods.
* <p>
* See {@link #createWithLocationInfoSanitizedIfNecessaryWhenParceled} and {@link
* See {@link #createWithSensitiveInfoSanitizedIfNecessaryWhenParceled} and {@link
* #ensureSufficientPermissionsForRequest} for how this method should be used.
*/
@Nullable

16
service/src/com/android/server/ConnectivityService.java
View file

@ -2906,7 +2906,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
&& !result.containsKey(nai.network)) {
result.put(
nai.network,
createWithLocationInfoSanitizedIfNecessaryWhenParceled(
createWithSensitiveInfoSanitizedIfNecessaryWhenParceled(
nc, false /* includeLocationSensitiveInfo */,
getCallingPid(), mDeps.getCallingUid(), callingPackageName,
callingAttributionTag));
@ -2921,7 +2921,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
if (null != nc) {
result.put(
network,
createWithLocationInfoSanitizedIfNecessaryWhenParceled(
createWithSensitiveInfoSanitizedIfNecessaryWhenParceled(
nc,
false /* includeLocationSensitiveInfo */,
getCallingPid(), mDeps.getCallingUid(), callingPackageName,
@ -3129,7 +3129,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
@Nullable String callingAttributionTag) {
mAppOpsManager.checkPackage(mDeps.getCallingUid(), callingPackageName);
enforceAccessPermission();
return createWithLocationInfoSanitizedIfNecessaryWhenParceled(
return createWithSensitiveInfoSanitizedIfNecessaryWhenParceled(
getNetworkCapabilitiesInternal(network),
false /* includeLocationSensitiveInfo */,
getCallingPid(), mDeps.getCallingUid(), callingPackageName, callingAttributionTag);
@ -3145,7 +3145,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
if (!hasAccessPermission(-1 /* pid */, uid)) {
return null;
}
return createWithLocationInfoSanitizedIfNecessaryWhenParceled(
return createWithSensitiveInfoSanitizedIfNecessaryWhenParceled(
nc, true /* includeLocationSensitiveInfo */, -1 /* callingPid */, uid, packageName,
callingAttributionTag);
}
@ -3300,7 +3300,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
@VisibleForTesting
@Nullable
NetworkCapabilities createWithLocationInfoSanitizedIfNecessaryWhenParceled(
NetworkCapabilities createWithSensitiveInfoSanitizedIfNecessaryWhenParceled(
@Nullable NetworkCapabilities nc, boolean includeLocationSensitiveInfo,
int callingPid, int callingUid, @NonNull String callingPkgName,
@Nullable String callingAttributionTag) {
@ -11819,7 +11819,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
switch (notificationType) {
case CALLBACK_RESERVED: {
final NetworkCapabilities nc =
createWithLocationInfoSanitizedIfNecessaryWhenParceled(
createWithSensitiveInfoSanitizedIfNecessaryWhenParceled(
nri.getReservedCapabilities(), includeLocationSensitiveInfo,
nri.mPid, nri.mUid, nrForCallback.getRequestorPackageName(),
nri.mCallingAttributionTag);
@ -11828,7 +11828,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
}
case CALLBACK_AVAILABLE: {
final NetworkCapabilities nc =
createWithLocationInfoSanitizedIfNecessaryWhenParceled(
createWithSensitiveInfoSanitizedIfNecessaryWhenParceled(
networkAgent.networkCapabilities, includeLocationSensitiveInfo,
nri.mPid, nri.mUid, nrForCallback.getRequestorPackageName(),
nri.mCallingAttributionTag);
@ -11845,7 +11845,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
// networkAgent can't be null as it has been accessed a few lines above.
putParcelable(
bundle,
createWithLocationInfoSanitizedIfNecessaryWhenParceled(
createWithSensitiveInfoSanitizedIfNecessaryWhenParceled(
networkAgent.networkCapabilities, includeLocationSensitiveInfo,
nri.mPid, nri.mUid, nrForCallback.getRequestorPackageName(),
nri.mCallingAttributionTag));

14
tests/unit/java/com/android/server/ConnectivityServiceTest.java
View file

@ -12452,7 +12452,7 @@ public class ConnectivityServiceTest {
boolean includeLocationSensitiveInfo) {
final NetworkCapabilities netCap = new NetworkCapabilities().setOwnerUid(ownerUid);
return mService.createWithLocationInfoSanitizedIfNecessaryWhenParceled(
return mService.createWithSensitiveInfoSanitizedIfNecessaryWhenParceled(
netCap, includeLocationSensitiveInfo, Process.myUid(), callerUid,
mContext.getPackageName(), getAttributionTag())
.getOwnerUid();
@ -12466,7 +12466,7 @@ public class ConnectivityServiceTest {
final NetworkCapabilities netCap =
new NetworkCapabilities().setTransportInfo(transportInfo);
mService.createWithLocationInfoSanitizedIfNecessaryWhenParceled(
mService.createWithSensitiveInfoSanitizedIfNecessaryWhenParceled(
netCap, includeLocationSensitiveInfo, Process.myPid(), callerUid,
mContext.getPackageName(), getAttributionTag());
if (shouldMakeCopyWithLocationSensitiveFieldsParcelable) {
@ -12624,7 +12624,7 @@ public class ConnectivityServiceTest {
final NetworkCapabilities netCap =
new NetworkCapabilities().setTransportInfo(transportInfo);
mService.createWithLocationInfoSanitizedIfNecessaryWhenParceled(
mService.createWithSensitiveInfoSanitizedIfNecessaryWhenParceled(
netCap, false /* includeLocationSensitiveInfoInTransportInfo */,
Process.myPid(), Process.myUid(),
mContext.getPackageName(), getAttributionTag());
@ -12643,7 +12643,7 @@ public class ConnectivityServiceTest {
final NetworkCapabilities netCap =
new NetworkCapabilities().setTransportInfo(transportInfo);
mService.createWithLocationInfoSanitizedIfNecessaryWhenParceled(
mService.createWithSensitiveInfoSanitizedIfNecessaryWhenParceled(
netCap, false /* includeLocationSensitiveInfoInTransportInfo */,
Process.myPid(), Process.myUid(),
mContext.getPackageName(), getAttributionTag());
@ -12663,7 +12663,7 @@ public class ConnectivityServiceTest {
final NetworkCapabilities netCap =
new NetworkCapabilities().setTransportInfo(transportInfo);
mService.createWithLocationInfoSanitizedIfNecessaryWhenParceled(
mService.createWithSensitiveInfoSanitizedIfNecessaryWhenParceled(
netCap, false /* includeLocationSensitiveInfoInTransportInfo */,
Process.myPid(), Process.myUid(),
mContext.getPackageName(), getAttributionTag());
@ -12682,7 +12682,7 @@ public class ConnectivityServiceTest {
final NetworkCapabilities netCap =
new NetworkCapabilities().setTransportInfo(transportInfo);
mService.createWithLocationInfoSanitizedIfNecessaryWhenParceled(
mService.createWithSensitiveInfoSanitizedIfNecessaryWhenParceled(
netCap, false /* includeLocationSensitiveInfoInTransportInfo */,
Process.myPid(), Process.myUid(),
mContext.getPackageName(), getAttributionTag());
@ -17505,7 +17505,7 @@ public class ConnectivityServiceTest {
nc.setSubscriptionIds(subIds);
final NetworkCapabilities result =
mService.createWithLocationInfoSanitizedIfNecessaryWhenParceled(
mService.createWithSensitiveInfoSanitizedIfNecessaryWhenParceled(
nc, false /* includeLocationSensitiveInfo */, Process.myPid(),
Process.myUid(), mContext.getPackageName(), getAttributionTag());
assertEquals(subIds, result.getSubscriptionIds());