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

am 75b5e996: am 9e7a5a1e: Merge "ConnectivityService needs to use the new names for the NetConfig vars." into honeycomb-LTE

Browse Source 
* commit '75b5e9967f4c61642316c8a8a861c51d2aa3faeb':
  ConnectivityService needs to use the new names for the NetConfig vars.
This commit is contained in:
Wink Saville
2011-04-07 14:31:20 -07:00
committed by Android Git Automerger
parent f7ca6f7ddf 75b5e9967f
commit 75d9e1cd13
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -317,22 +317,22 @@ public class ConnectivityService extends IConnectivityManager.Stub {
for (String naString : naStrings) {
try {
NetworkConfig n = new NetworkConfig(naString);
if (n.mType > ConnectivityManager.MAX_NETWORK_TYPE) {
if (n.type > ConnectivityManager.MAX_NETWORK_TYPE) {
loge("Error in networkAttributes - ignoring attempt to define type " +
n.mType);
n.type);
continue;
}
if (mNetConfigs[n.mType] != null) {
if (mNetConfigs[n.type] != null) {
loge("Error in networkAttributes - ignoring attempt to redefine type " +
n.mType);
n.type);
continue;
}
if (mRadioAttributes[n.mRadio] == null) {
if (mRadioAttributes[n.radio] == null) {
loge("Error in networkAttributes - ignoring attempt to use undefined " +
"radio " + n.mRadio + " in network type " + n.mType);
"radio " + n.radio + " in network type " + n.type);
continue;
}
mNetConfigs[n.mType] = n;
mNetConfigs[n.type] = n;
mNetworksDefined++;
} catch(Exception e) {
// ignore it - leave the entry null
@@ -348,14 +348,14 @@ public class ConnectivityService extends IConnectivityManager.Stub {
while (insertionPoint > -1) {
for (NetworkConfig na : mNetConfigs) {
if (na == null) continue;
if (na.mPriority < currentLowest) continue;
if (na.mPriority > currentLowest) {
if (na.mPriority < nextLowest || nextLowest == 0) {
nextLowest = na.mPriority;
if (na.priority < currentLowest) continue;
if (na.priority > currentLowest) {
if (na.priority < nextLowest || nextLowest == 0) {
nextLowest = na.priority;
}
continue;
}
mPriorityList[insertionPoint--] = na.mType;
mPriorityList[insertionPoint--] = na.type;
}
currentLowest = nextLowest;
nextLowest = 0;
@@ -381,7 +381,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
* to change very often.
*/
for (int netType : mPriorityList) {
switch (mNetConfigs[netType].mRadio) {
switch (mNetConfigs[netType].radio) {
case ConnectivityManager.TYPE_WIFI:
if (DBG) log("Starting Wifi Service.");
WifiStateTracker wst = new WifiStateTracker();
@@ -397,12 +397,12 @@ public class ConnectivityService extends IConnectivityManager.Stub {
break;
case ConnectivityManager.TYPE_MOBILE:
mNetTrackers[netType] = new MobileDataStateTracker(netType,
mNetConfigs[netType].mName);
mNetConfigs[netType].name);
mNetTrackers[netType].startMonitoring(context, mHandler);
break;
case ConnectivityManager.TYPE_DUMMY:
mNetTrackers[netType] = new DummyDataStateTracker(netType,
mNetConfigs[netType].mName);
mNetConfigs[netType].name);
mNetTrackers[netType].startMonitoring(context, mHandler);
break;
case ConnectivityManager.TYPE_BLUETOOTH:
@@ -415,7 +415,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
break;
default:
loge("Trying to create a DataStateTracker for an unknown radio type " +
mNetConfigs[netType].mRadio);
mNetConfigs[netType].radio);
continue;
}
}
@@ -1280,8 +1280,8 @@ public class ConnectivityService extends IConnectivityManager.Stub {
if (mNetConfigs[type].isDefault()) {
if (mActiveDefaultNetwork != -1 && mActiveDefaultNetwork != type) {
if ((type != mNetworkPreference &&
mNetConfigs[mActiveDefaultNetwork].mPriority >
mNetConfigs[type].mPriority) ||
mNetConfigs[mActiveDefaultNetwork].priority >
mNetConfigs[type].priority) ||
mNetworkPreference == mActiveDefaultNetwork) {
// don't accept this one
if (DBG) {