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

Correct an error code to pass CTS. am: 5364d754c9

Browse Source 
Original change: undetermined

Change-Id: I94796bcfdecd3e0e18b7b886180af7ba8c283785
This commit is contained in:
Robert Greenwalt
2021-05-31 04:06:13 +00:00
committed by Automerger Merge Worker
parent 159263c0a1 5364d754c9
commit 28a36cdb44
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/java/com/android/server/ConnectivityService.java
View File

@@ -698,9 +698,8 @@ public class ConnectivityService extends IConnectivityManager.Stub {
}
NetworkStateTracker network = mNetTrackers[usedNetworkType];
if (network != null) {
Integer currentPid = new Integer(getCallingPid());
if (usedNetworkType != networkType) {
Integer currentPid = new Integer(getCallingPid());
NetworkStateTracker radio = mNetTrackers[networkType];
NetworkInfo ni = network.getNetworkInfo();
@@ -739,6 +738,14 @@ public class ConnectivityService extends IConnectivityManager.Stub {
network.reconnect();
return Phone.APN_REQUEST_STARTED;
} else {
// need to remember this unsupported request so we respond appropriately on stop
synchronized(this) {
mFeatureUsers.add(f);
if (!mNetRequestersPids[usedNetworkType].contains(currentPid)) {
// this gets used for per-pid dns when connected
mNetRequestersPids[usedNetworkType].add(currentPid);
}
}
return -1;
}
}