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

resolved conflicts for merge of b427f0e6 to honeycomb-plus-aosp

Browse Source 
Change-Id: I8e287fd814b4a3ca72014ea060a1de043d1b4713
This commit is contained in:
Robert Greenwalt
2011-06-20 12:15:24 -07:00
parent 00ca322d5d 33cdcdf2fa
commit 796539b12a
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"; 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 * The Default Mobile data connection. When active, all data traffic
* will use this connection by default. * will use this connection by default.

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

@@ -431,12 +431,10 @@ public class ConnectivityService extends IConnectivityManager.Stub {
} }
mTethering = new Tethering(mContext, mHandler.getLooper()); mTethering = new Tethering(mContext, mHandler.getLooper());
mTetheringConfigValid = (((mNetTrackers[ConnectivityManager.TYPE_MOBILE_DUN] != null) || mTetheringConfigValid = ((mTethering.getTetherableUsbRegexs().length != 0 ||
!mTethering.isDunRequired()) &&
(mTethering.getTetherableUsbRegexs().length != 0 ||
mTethering.getTetherableWifiRegexs().length != 0 || mTethering.getTetherableWifiRegexs().length != 0 ||
mTethering.getTetherableBluetoothRegexs().length != 0) && mTethering.getTetherableBluetoothRegexs().length != 0) &&
mTethering.getUpstreamIfaceRegexs().length != 0); mTethering.getUpstreamIfaceTypes().length != 0);
if (DBG) { if (DBG) {
mInetLog = new ArrayList(); mInetLog = new ArrayList();
@@ -1414,12 +1412,6 @@ public class ConnectivityService extends IConnectivityManager.Stub {
} }
addPrivateDnsRoutes(mNetTrackers[netType]); 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 { } else {
if (mNetConfigs[netType].isDefault()) { if (mNetConfigs[netType].isDefault()) {
removeDefaultRoute(mNetTrackers[netType]); removeDefaultRoute(mNetTrackers[netType]);
@@ -2267,14 +2259,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) { private void log(String s) {
Slog.d(TAG, s); Slog.d(TAG, s);
} }