resolved conflicts for merge of dec3dda8 to honeycomb-plus-aosp (5a6bec53) · Commits · e / os / android_frameworks_base

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

+2 −17

Original line number	Diff line number	Diff line
		@@ -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) {