From df11e5b2b53b140e243a5b6ff6431743b1a34d34 Mon Sep 17 00:00:00 2001 From: Erik Kline Date: Sun, 30 Apr 2017 19:36:15 +0900 Subject: [PATCH] Add tethering offload HAL call via JNI Additionally, try to locate java Control interface. Test: as follows - built - flashed - booted - OffloadController log messages observed, but only ever "not enabled" messages (needs a supporting implementation) Bug: 29337859 Bug: 32163131 Bug: 34361337 Merged-In: I5251d05f2d2fd732a33a8955a6c346b3a2401e46 Change-Id: I5251d05f2d2fd732a33a8955a6c346b3a2401e46 (cherry picked from commit 8784c80e423d42286c76e953f4a2d8432656ea59) --- .../java/com/android/server/ConnectivityService.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index bee1659efb..47026d6815 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -145,6 +145,7 @@ import com.android.server.connectivity.NetworkNotificationManager.NotificationTy import com.android.server.connectivity.PacManager; import com.android.server.connectivity.PermissionMonitor; import com.android.server.connectivity.Tethering; +import com.android.server.connectivity.tethering.TetheringDependencies; import com.android.server.connectivity.Vpn; import com.android.server.net.BaseNetworkObserver; import com.android.server.net.LockdownVpnTracker; @@ -802,8 +803,7 @@ public class ConnectivityService extends IConnectivityManager.Stub mTestMode = mSystemProperties.get("cm.test.mode").equals("true") && mSystemProperties.get("ro.build.type").equals("eng"); - mTethering = new Tethering(mContext, mNetd, statsService, mPolicyManager, - IoThread.get().getLooper(), new MockableSystemProperties()); + mTethering = makeTethering(); mPermissionMonitor = new PermissionMonitor(mContext, mNetd); @@ -853,6 +853,14 @@ public class ConnectivityService extends IConnectivityManager.Stub mMultinetworkPolicyTracker.start(); } + private Tethering makeTethering() { + // TODO: Move other elements into @Overridden getters. + final TetheringDependencies deps = new TetheringDependencies(); + return new Tethering(mContext, mNetd, mStatsService, mPolicyManager, + IoThread.get().getLooper(), new MockableSystemProperties(), + deps); + } + private NetworkRequest createInternetRequestForTransport( int transportType, NetworkRequest.Type type) { NetworkCapabilities netCap = new NetworkCapabilities();