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

Merge "ConnectivityService get INetd directly." am: ddc1add0ac

Browse Source 
am: 47820e87d4

Change-Id: Ia6c32320eea3117f7a79a6360b7819c64a88faa5
This commit is contained in:
Luke Huang
2018-10-01 02:29:32 -07:00
committed by android-build-merger
parent b6113e8621 47820e87d4
commit 80f05e8cfc
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -57,6 +57,7 @@ import android.net.ConnectivityManager;
import android.net.ConnectivityManager.PacketKeepalive; import android.net.ConnectivityManager.PacketKeepalive;
import android.net.IConnectivityManager; import android.net.IConnectivityManager;
import android.net.IIpConnectivityMetrics; import android.net.IIpConnectivityMetrics;
import android.net.INetd;
import android.net.INetdEventCallback; import android.net.INetdEventCallback;
import android.net.INetworkManagementEventObserver; import android.net.INetworkManagementEventObserver;
import android.net.INetworkPolicyListener; import android.net.INetworkPolicyListener;
@@ -88,6 +89,7 @@ import android.net.metrics.IpConnectivityLog;
import android.net.metrics.NetworkEvent; import android.net.metrics.NetworkEvent;
import android.net.netlink.InetDiagMessage; import android.net.netlink.InetDiagMessage;
import android.net.util.MultinetworkPolicyTracker; import android.net.util.MultinetworkPolicyTracker;
import android.net.util.NetdService;
import android.os.Binder; import android.os.Binder;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
@@ -260,6 +262,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
private int mDefaultInetConditionPublished = 0; private int mDefaultInetConditionPublished = 0;
private INetworkManagementService mNMS; private INetworkManagementService mNMS;
private INetd mNetd;
private INetworkStatsService mStatsService; private INetworkStatsService mStatsService;
private INetworkPolicyManager mPolicyManager; private INetworkPolicyManager mPolicyManager;
private NetworkPolicyManagerInternal mPolicyManagerInternal; private NetworkPolicyManagerInternal mPolicyManagerInternal;
@@ -767,6 +770,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
"missing NetworkPolicyManagerInternal"); "missing NetworkPolicyManagerInternal");
mProxyTracker = new ProxyTracker(context, mHandler, EVENT_PROXY_HAS_CHANGED); mProxyTracker = new ProxyTracker(context, mHandler, EVENT_PROXY_HAS_CHANGED);
mNetd = NetdService.getInstance();
mKeyStore = KeyStore.getInstance(); mKeyStore = KeyStore.getInstance();
mTelephonyManager = (TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE); mTelephonyManager = (TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE);
@@ -4686,9 +4690,9 @@ public class ConnectivityService extends IConnectivityManager.Stub
final String prefix = "iface:" + iface; final String prefix = "iface:" + iface;
try { try {
if (add) { if (add) {
mNMS.getNetdService().wakeupAddInterface(iface, prefix, mark, mask); mNetd.wakeupAddInterface(iface, prefix, mark, mask);
} else { } else {
mNMS.getNetdService().wakeupDelInterface(iface, prefix, mark, mask); mNetd.wakeupDelInterface(iface, prefix, mark, mask);
} }
} catch (Exception e) { } catch (Exception e) {
loge("Exception modifying wakeup packet monitoring: " + e); loge("Exception modifying wakeup packet monitoring: " + e);