commit ece3171cf018936148c7443dd190814737de1642
author Colin Cross <ccross@android.com> Wed May 18 18:23:18 2022 +0000
committer Colin Cross <ccross@android.com> Wed May 18 18:30:27 2022 +0000
tree 0b878884b97b2a66bb08def76ed8980cb194da18
parent a8ce1aafbd9751903a7df6b1cd4fe2313912c031

Revert "Autogenerate connectivity jarjar rules"

This reverts commit 53eb35cd828cc92d6cb25858ca87c9330d22dea9.

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

Change-Id: Ide01c994f694b55fc0e87bb0e81584ac44196e68

framework/src/android/net/NattSocketKeepalive.java

diff --git a/framework/src/android/net/NattSocketKeepalive.java b/framework/src/android/net/NattSocketKeepalive.java
index 56cc923..a15d165 100644
--- a/framework/src/android/net/NattSocketKeepalive.java
+++ b/framework/src/android/net/NattSocketKeepalive.java
@@ -33,7 +33,7 @@
     @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 @@
     }
 
     @Override
-    protected void startImpl(int intervalSec) {
+    void startImpl(int intervalSec) {
         mExecutor.execute(() -> {
             try {
                 mService.startNattKeepaliveWithFd(mNetwork, mPfd, mResourceId,
@@ -62,7 +62,7 @@
     }
 
     @Override
-    protected void stopImpl() {
+    void stopImpl() {
         mExecutor.execute(() -> {
             try {
                 if (mSlot != null) {