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

ConnectivityService needs to use the new names for the NetConfig vars.

Browse Source 
Change-Id: I809a624057462871cd1849051286c2bffd5099e9
This commit is contained in:
Wink Saville
2011-04-07 14:23:45 -07:00
parent 2879f7352b
commit f2a6283da9
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

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