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

Merge "ConnectivityService: Plumb attribution tag for location permission checks" am: 482b2dda4f

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534625

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5150c4827d8d2a8154afdf4f7076846fe6e38630
This commit is contained in:
Roshan Pius
2021-02-08 19:26:46 +00:00
committed by Automerger Merge Worker
parent b20a56035c a8a477b84e
commit de46bf6d23
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
framework/src/android/net/ConnectivityManager.java
View File

@@ -1368,7 +1368,7 @@ public class ConnectivityManager {
public NetworkCapabilities[] getDefaultNetworkCapabilitiesForUser(int userId) { public NetworkCapabilities[] getDefaultNetworkCapabilitiesForUser(int userId) {
try { try {
return mService.getDefaultNetworkCapabilitiesForUser( return mService.getDefaultNetworkCapabilitiesForUser(
userId, mContext.getOpPackageName()); userId, mContext.getOpPackageName(), getAttributionTag());
} catch (RemoteException e) { } catch (RemoteException e) {
throw e.rethrowFromSystemServer(); throw e.rethrowFromSystemServer();
} }
@@ -1450,7 +1450,8 @@ public class ConnectivityManager {
@Nullable @Nullable
public NetworkCapabilities getNetworkCapabilities(@Nullable Network network) { public NetworkCapabilities getNetworkCapabilities(@Nullable Network network) {
try { try {
return mService.getNetworkCapabilities(network, mContext.getOpPackageName()); return mService.getNetworkCapabilities(
network, mContext.getOpPackageName(), getAttributionTag());
} catch (RemoteException e) { } catch (RemoteException e) {
throw e.rethrowFromSystemServer(); throw e.rethrowFromSystemServer();
} }
@@ -2142,7 +2143,7 @@ public class ConnectivityManager {
*/ */
// TODO: Remove method and replace with direct call once R code is pushed to AOSP // TODO: Remove method and replace with direct call once R code is pushed to AOSP
private @Nullable String getAttributionTag() { private @Nullable String getAttributionTag() {
return null; return mContext.getAttributionTag();
} }
/** /**
@@ -3735,7 +3736,8 @@ public class ConnectivityManager {
Binder binder = new Binder(); Binder binder = new Binder();
if (reqType == LISTEN) { if (reqType == LISTEN) {
request = mService.listenForNetwork( request = mService.listenForNetwork(
need, messenger, binder, callingPackageName); need, messenger, binder, callingPackageName,
getAttributionTag());
} else { } else {
request = mService.requestNetwork( request = mService.requestNetwork(
need, reqType.ordinal(), messenger, timeoutMs, binder, legacyType, need, reqType.ordinal(), messenger, timeoutMs, binder, legacyType,
@@ -4180,7 +4182,8 @@ public class ConnectivityManager {
checkPendingIntentNotNull(operation); checkPendingIntentNotNull(operation);
try { try {
mService.pendingListenForNetwork( mService.pendingListenForNetwork(
request.networkCapabilities, operation, mContext.getOpPackageName()); request.networkCapabilities, operation, mContext.getOpPackageName(),
getAttributionTag());
} catch (RemoteException e) { } catch (RemoteException e) {
throw e.rethrowFromSystemServer(); throw e.rethrowFromSystemServer();
} catch (ServiceSpecificException e) { } catch (ServiceSpecificException e) {

11
framework/src/android/net/IConnectivityManager.aidl
View File

@@ -66,7 +66,7 @@ interface IConnectivityManager
Network getNetworkForType(int networkType); Network getNetworkForType(int networkType);
Network[] getAllNetworks(); Network[] getAllNetworks();
NetworkCapabilities[] getDefaultNetworkCapabilitiesForUser( NetworkCapabilities[] getDefaultNetworkCapabilitiesForUser(
int userId, String callingPackageName); int userId, String callingPackageName, String callingAttributionTag);
boolean isNetworkSupported(int networkType); boolean isNetworkSupported(int networkType);
@@ -75,7 +75,8 @@ interface IConnectivityManager
LinkProperties getLinkPropertiesForType(int networkType); LinkProperties getLinkPropertiesForType(int networkType);
LinkProperties getLinkProperties(in Network network); LinkProperties getLinkProperties(in Network network);
NetworkCapabilities getNetworkCapabilities(in Network network, String callingPackageName); NetworkCapabilities getNetworkCapabilities(in Network network, String callingPackageName,
String callingAttributionTag);
@UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553)
NetworkState[] getAllNetworkState(); NetworkState[] getAllNetworkState();
@@ -176,10 +177,12 @@ interface IConnectivityManager
void releasePendingNetworkRequest(in PendingIntent operation); void releasePendingNetworkRequest(in PendingIntent operation);
NetworkRequest listenForNetwork(in NetworkCapabilities networkCapabilities, NetworkRequest listenForNetwork(in NetworkCapabilities networkCapabilities,
in Messenger messenger, in IBinder binder, String callingPackageName); in Messenger messenger, in IBinder binder, String callingPackageName,
String callingAttributionTag);
void pendingListenForNetwork(in NetworkCapabilities networkCapabilities, void pendingListenForNetwork(in NetworkCapabilities networkCapabilities,
in PendingIntent operation, String callingPackageName); in PendingIntent operation, String callingPackageName,
String callingAttributionTag);
void releaseNetworkRequest(in NetworkRequest networkRequest); void releaseNetworkRequest(in NetworkRequest networkRequest);