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

Merge "No-op cleanup" am: e88bfbc015 am: 8a867d17a0

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1868845

Change-Id: Ia33ef9b8b7f120491f78dfb825301a0b13611de5
This commit is contained in:
Chalard Jean
2021-10-26 03:10:01 +00:00
committed by Automerger Merge Worker
parent 0e22eedfac 8a867d17a0
commit ac2655d3a5
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
service/src/com/android/server/ConnectivityService.java
View File

@@ -1332,7 +1332,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
final NetworkRequest defaultInternetRequest = createDefaultRequest(); final NetworkRequest defaultInternetRequest = createDefaultRequest();
mDefaultRequest = new NetworkRequestInfo( mDefaultRequest = new NetworkRequestInfo(
Process.myUid(), defaultInternetRequest, null, Process.myUid(), defaultInternetRequest, null,
new Binder(), NetworkCallback.FLAG_INCLUDE_LOCATION_INFO, null /* binder */, NetworkCallback.FLAG_INCLUDE_LOCATION_INFO,
null /* attributionTags */); null /* attributionTags */);
mNetworkRequests.put(defaultInternetRequest, mDefaultRequest); mNetworkRequests.put(defaultInternetRequest, mDefaultRequest);
mDefaultNetworkRequests.add(mDefaultRequest); mDefaultNetworkRequests.add(mDefaultRequest);
@@ -1552,7 +1552,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
if (enable) { if (enable) {
handleRegisterNetworkRequest(new NetworkRequestInfo( handleRegisterNetworkRequest(new NetworkRequestInfo(
Process.myUid(), networkRequest, null, new Binder(), Process.myUid(), networkRequest, null /* messenger */, null /* binder */,
NetworkCallback.FLAG_INCLUDE_LOCATION_INFO, NetworkCallback.FLAG_INCLUDE_LOCATION_INFO,
null /* attributionTags */)); null /* attributionTags */));
} else { } else {
@@ -6061,7 +6061,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
@Override @Override
public NetworkRequest requestNetwork(int asUid, NetworkCapabilities networkCapabilities, public NetworkRequest requestNetwork(int asUid, NetworkCapabilities networkCapabilities,
int reqTypeInt, Messenger messenger, int timeoutMs, IBinder binder, int reqTypeInt, Messenger messenger, int timeoutMs, final IBinder binder,
int legacyType, int callbackFlags, @NonNull String callingPackageName, int legacyType, int callbackFlags, @NonNull String callingPackageName,
@Nullable String callingAttributionTag) { @Nullable String callingAttributionTag) {
if (legacyType != TYPE_NONE && !checkNetworkStackPermission()) { if (legacyType != TYPE_NONE && !checkNetworkStackPermission()) {