Merge "Fix findConnectionTypeForIface." into lmp-dev (a945c352) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/ConnectivityService.java

+7 −5

Original line number	Diff line number	Diff line
		@@ -2850,11 +2850,13 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		enforceConnectivityInternalPermission();

		if (TextUtils.isEmpty(iface)) return ConnectivityManager.TYPE_NONE;
		for (NetworkStateTracker tracker : mNetTrackers) {
		if (tracker != null) {
		LinkProperties lp = tracker.getLinkProperties();
		if (lp != null && iface.equals(lp.getInterfaceName())) {
		return tracker.getNetworkInfo().getType();

		synchronized(mNetworkForNetId) {
		for (int i = 0; i < mNetworkForNetId.size(); i++) {
		NetworkAgentInfo nai = mNetworkForNetId.valueAt(i);
		LinkProperties lp = nai.linkProperties;
		if (lp != null && iface.equals(lp.getInterfaceName()) && nai.networkInfo != null) {
		return nai.networkInfo.getType();
		}
		}
		}