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

resolved conflicts for merge of 796539b1 to master

Browse Source 
Change-Id: Id0a41cae36f5a3b30f2fe8a202c934153b9cd03f
This commit is contained in:
Robert Greenwalt
2011-06-22 13:20:14 -07:00
parent d723e62717 796539b12a
commit 09d6cdf338
2 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/net/ConnectivityManager.java
View File

@@ -163,6 +163,12 @@ public class ConnectivityManager {
*/
public static final String EXTRA_ERRORED_TETHER = "erroredArray";
/**
* The absence of APN..
* @hide
*/
public static final int TYPE_NONE = -1;
/**
* The Default Mobile data connection. When active, all data traffic
* will use this connection by default.

20
services/java/com/android/server/ConnectivityService.java
View File

@@ -466,12 +466,10 @@ public class ConnectivityService extends IConnectivityManager.Stub {
INetworkManagementService nmService = INetworkManagementService.Stub.asInterface(b);
mTethering = new Tethering(mContext, nmService, mHandler.getLooper());
mTetheringConfigValid = (((mNetTrackers[ConnectivityManager.TYPE_MOBILE_DUN] != null) ||
!mTethering.isDunRequired()) &&
(mTethering.getTetherableUsbRegexs().length != 0 ||
mTetheringConfigValid = ((mTethering.getTetherableUsbRegexs().length != 0 ||
mTethering.getTetherableWifiRegexs().length != 0 ||
mTethering.getTetherableBluetoothRegexs().length != 0) &&
mTethering.getUpstreamIfaceRegexs().length != 0);
mTethering.getUpstreamIfaceTypes().length != 0);
mVpn = new Vpn(mContext, new VpnCallback());
@@ -1576,12 +1574,6 @@ public class ConnectivityService extends IConnectivityManager.Stub {
}
addPrivateDnsRoutes(mNetTrackers[netType]);
}
/** Notify TetheringService if interface name has been changed. */
if (TextUtils.equals(mNetTrackers[netType].getNetworkInfo().getReason(),
Phone.REASON_LINK_PROPERTIES_CHANGED)) {
handleTetherIfaceChange(netType);
}
} else {
if (mNetConfigs[netType].isDefault()) {
removeDefaultRoute(mNetTrackers[netType]);
@@ -2412,14 +2404,6 @@ public class ConnectivityService extends IConnectivityManager.Stub {
}
}
private void handleTetherIfaceChange(int type) {
String iface = mNetTrackers[type].getLinkProperties().getInterfaceName();
if (isTetheringSupported()) {
mTethering.handleTetherIfaceChange(iface);
}
}
private void log(String s) {
Slog.d(TAG, s);
}