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

am e0f7bc0b: resolved conflicts for merge of dec3dda8 to honeycomb-plus-aosp am: 1b507045bd

Browse Source 
Original change: undetermined

Change-Id: Ieea002a2d5952638e2442c1949d1b940d832dbac
This commit is contained in:
Robert Greenwalt
2021-05-31 04:21:29 +00:00
committed by Automerger Merge Worker
parent e8603f236f 1b507045bd
commit 40003fdda9
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) {