joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Revert "Autogenerate connectivity jarjar rules"

Browse source 
This reverts commit 53eb35cd82.

Reason for revert: b/233081774, caused long build times in FrameworkNetTests

Change-Id: Ide01c994f694b55fc0e87bb0e81584ac44196e68
This commit is contained in:
Colin Cross 2022-05-18 18:23:18 +00:00
commit ece3171cf0
1 changed files with 169 additions and 418 deletions
Download patch file Download diff file Expand all files Collapse all files

6
framework/src/android/net/NattSocketKeepalive.java
View file

@ -33,7 +33,7 @@ public final class NattSocketKeepalive extends SocketKeepalive {
@NonNull private final InetAddress mDestination;
private final int mResourceId;
public NattSocketKeepalive(@NonNull IConnectivityManager service,
NattSocketKeepalive(@NonNull IConnectivityManager service,
@NonNull Network network,
@NonNull ParcelFileDescriptor pfd,
int resourceId,
@ -48,7 +48,7 @@ public final class NattSocketKeepalive extends SocketKeepalive {
}
@Override
protected void startImpl(int intervalSec) {
void startImpl(int intervalSec) {
mExecutor.execute(() -> {
try {
mService.startNattKeepaliveWithFd(mNetwork, mPfd, mResourceId,
@ -62,7 +62,7 @@ public final class NattSocketKeepalive extends SocketKeepalive {
}
@Override
protected void stopImpl() {
void stopImpl() {
mExecutor.execute(() -> {
try {
if (mSlot != null) {