Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 5a6bec53: resolved conflicts for merge of dec3dda8 to honeycomb-plus-aosp

Browse Source 
* commit '5a6bec53e224b2db9ecbc6920faab08f4a962256':
  Simplfy getActive* calls in ConnectivityService
This commit is contained in:
Robert Greenwalt
2011-05-21 21:35:38 -07:00
committed by Android Git Automerger
parent 5710e72d91 5a6bec53e2
commit 8508485871
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

@@ -543,11 +543,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) {
@@ -579,18 +575,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) {