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

Merge "Add flag to test BpfNetMaps refactoring" am: 64f706fe2c

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2162998

Change-Id: I131efe444d25c532967fd8ea651ae0b713dd8aef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Motomu Utsumi
2022-07-28 12:58:10 +00:00
committed by Automerger Merge Worker
parent b687cef5e4 64f706fe2c
commit 76e3be3f4f
6 changed files with 39 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
service/src/com/android/server/ConnectivityService.java
View File

@@ -1399,8 +1399,8 @@ public class ConnectivityService extends IConnectivityManager.Stub
* @param netd
* @return BpfNetMaps implementation.
*/
public BpfNetMaps getBpfNetMaps(INetd netd) {
return new BpfNetMaps(netd);
public BpfNetMaps getBpfNetMaps(Context context, INetd netd) {
return new BpfNetMaps(context, netd);
}
/**
@@ -1529,7 +1529,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
mProxyTracker = mDeps.makeProxyTracker(mContext, mHandler);
mNetd = netd;
mBpfNetMaps = mDeps.getBpfNetMaps(netd);
mBpfNetMaps = mDeps.getBpfNetMaps(mContext, netd);
mTelephonyManager = (TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE);
mAppOpsManager = (AppOpsManager) mContext.getSystemService(Context.APP_OPS_SERVICE);
mLocationPermissionChecker = mDeps.makeLocationPermissionChecker(mContext);