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

Merge "Fix findConnectionTypeForIface." into lmp-dev

Browse Source
This commit is contained in:
Lorenzo Colitti
2014-08-21 16:08:11 +00:00
committed by Android (Google) Code Review
parent c2e050b138 bcc9260028
commit 209058ec6e
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -2850,11 +2850,13 @@ public class ConnectivityService extends IConnectivityManager.Stub {
enforceConnectivityInternalPermission(); enforceConnectivityInternalPermission();
if (TextUtils.isEmpty(iface)) return ConnectivityManager.TYPE_NONE; if (TextUtils.isEmpty(iface)) return ConnectivityManager.TYPE_NONE;
for (NetworkStateTracker tracker : mNetTrackers) {
if (tracker != null) { synchronized(mNetworkForNetId) {
LinkProperties lp = tracker.getLinkProperties(); for (int i = 0; i < mNetworkForNetId.size(); i++) {
if (lp != null && iface.equals(lp.getInterfaceName())) { NetworkAgentInfo nai = mNetworkForNetId.valueAt(i);
return tracker.getNetworkInfo().getType(); LinkProperties lp = nai.linkProperties;
if (lp != null && iface.equals(lp.getInterfaceName()) && nai.networkInfo != null) {
return nai.networkInfo.getType();
} }
} }
} }