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

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

Browse Source 
Change-Id: If14c7fc51c4549524c2f39797a902093582bae6d
This commit is contained in:
Robert Greenwalt
2011-05-20 15:45:55 -07:00
parent 2a4ebb810d e1544bb9ea
commit e0f7bc0b84
1 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -540,11 +540,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
* active
*/
public NetworkInfo getActiveNetworkInfo() {
enforceAccessPermission();
if (mActiveDefaultNetwork != -1) {
return mNetTrackers[mActiveDefaultNetwork].getNetworkInfo();
}
return null;
return getNetworkInfo(mActiveDefaultNetwork);
}
public NetworkInfo getNetworkInfo(int networkType) {
@@ -576,18 +572,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
* none is active
*/
public LinkProperties getActiveLinkProperties() {
enforceAccessPermission();
for (int type=0; type <= ConnectivityManager.MAX_NETWORK_TYPE; type++) {
if (mNetConfigs[type] == null || !mNetConfigs[type].isDefault()) {
continue;
}
NetworkStateTracker t = mNetTrackers[type];
NetworkInfo info = t.getNetworkInfo();
if (info.isConnected()) {
return t.getLinkProperties();
}
}
return null;
return getLinkProperties(mActiveDefaultNetwork);
}
public LinkProperties getLinkProperties(int networkType) {