Merge "Simplfy getActive* calls in ConnectivityService" into honeycomb-LTE (dec3dda8) · Commits · e / os / android_frameworks_base

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

+2 −27

Original line number	Original line	Diff line number	Diff line
	@@ -540,21 +540,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
	* active		* active
	*/		*/
	public NetworkInfo getActiveNetworkInfo() {		public NetworkInfo getActiveNetworkInfo() {
	enforceAccessPermission();		return getNetworkInfo(mActiveDefaultNetwork);
	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()) {
	if (DBG && type != mActiveDefaultNetwork) {
	loge("connected default network is not mActiveDefaultNetwork!");
	}
	return info;
	}
	}
	return null;
	}		}

	public NetworkInfo getNetworkInfo(int networkType) {		public NetworkInfo getNetworkInfo(int networkType) {
	@@ -586,18 +572,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
	* none is active		* none is active
	*/		*/
	public LinkProperties getActiveLinkProperties() {		public LinkProperties getActiveLinkProperties() {
	enforceAccessPermission();		return getLinkProperties(mActiveDefaultNetwork);
	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;
	}		}

	public LinkProperties getLinkProperties(int networkType) {		public LinkProperties getLinkProperties(int networkType) {