Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 387a5dd7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove hidden INVALID_RESOURCE_ID in unused param" am: 3e432de2 am:... 

Merge "Remove hidden INVALID_RESOURCE_ID in unused param" am: 3e432de2 am: 88b6a466 am: 2e5256b1

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628299

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibfe6a57de8deb33fc4a63acdf0ea264d5e506883
parents 030a0401 2e5256b1

packages/Connectivity/framework/src/android/net/ConnectivityManager.java

+1 −2
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
package android.net;



import static android.annotation.SystemApi.Client.MODULE_LIBRARIES;

import static android.net.IpSecManager.INVALID_RESOURCE_ID;

import static android.net.NetworkRequest.Type.BACKGROUND_REQUEST;

import static android.net.NetworkRequest.Type.LISTEN;

import static android.net.NetworkRequest.Type.REQUEST;
@@ -2006,7 +2005,7 @@ public class ConnectivityManager { 
            dup = createInvalidFd();

        }

        return new NattSocketKeepalive(mService, network, dup,

                INVALID_RESOURCE_ID /* Unused */, source, destination, executor, callback);

                -1 /* Unused */, source, destination, executor, callback);

    }



    /**