e55a88d30f
(This rolls forward part of a previous change, now that jarjar was fixed to not get very slow when the number of rules increases). Autogenerate connectivity jarjar rules at build time, to avoid issues with forgotten jarjar rules or hard-to-diagnose errors introduced by incorrect rules. This change causes all classes in framework-connectivity(-t) and service-connectivity to be jarjared into android.net.connectivity, but still avoids jarjaring classes in com.android.server as before, to keep it small. For many classes this differs from the original jarjar rule. Notes on implementation: - connectivity-jarjar-rules now has a subset framework-connectivity-jarjar-rules containing only the rules necessary for framework-connectivity. This is necessary because framework-connectivity cannot depend on rules generated based on service-connectivity, as there would be a dependency cycle (service-connectivity depends on framework-connectivity); Soong even crashes with a stack overflow. - framework-wifi.stubs.module_lib is added to framework-connectivity-pre-jarjar as it is necessary to build it (it is already in impl_only_libs in the defaults). It is unclear why framework-connectivity-pre-jarjar could build before that (possibly because it was only used as "lib" ?) - Fix package-private visibility; for example NattSocketKeepalive, TcpSocketKeepalive are not API so should be jarjared, but are used by ConnectivityManager which is not jarjared, so they are not in the same package after the change. Package-private members in the former 2 need to be public to be accessible. Changes in this commit are all that is needed, as demonstrated by followup commits that move the classes to a different package without further changes, and that enforce that no class in an API package gets jarjared. - framework-connectivity-internal-test-defaults is separated from framework-connectivity-test-defaults, for unit tests that need to access internal jarjared classes. Such tests need to use the jarjar rules themselves too, so this is only appropriate for connectivity internal unit tests. Test: atest ConnectivityCoverageTests CtsNetTestCases Bug: 217129444 Change-Id: Ib1bd939b71c0171d945fc01b96195d2f620ff13b
77 lines
3 KiB
Java
77 lines
3 KiB
Java
/*
|
|
* Copyright (C) 2019 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
package android.net;
|
|
|
|
import android.annotation.NonNull;
|
|
import android.os.ParcelFileDescriptor;
|
|
import android.os.RemoteException;
|
|
import android.util.Log;
|
|
|
|
import java.util.concurrent.Executor;
|
|
|
|
/** @hide */
|
|
public final class TcpSocketKeepalive extends SocketKeepalive {
|
|
|
|
public TcpSocketKeepalive(@NonNull IConnectivityManager service,
|
|
@NonNull Network network,
|
|
@NonNull ParcelFileDescriptor pfd,
|
|
@NonNull Executor executor,
|
|
@NonNull Callback callback) {
|
|
super(service, network, pfd, executor, callback);
|
|
}
|
|
|
|
/**
|
|
* Starts keepalives. {@code mSocket} must be a connected TCP socket.
|
|
*
|
|
* - The application must not write to or read from the socket after calling this method, until
|
|
* onDataReceived, onStopped, or onError are called. If it does, the keepalive will fail
|
|
* with {@link #ERROR_SOCKET_NOT_IDLE}, or {@code #ERROR_INVALID_SOCKET} if the socket
|
|
* experienced an error (as in poll(2) returned POLLERR or POLLHUP); if this happens, the data
|
|
* received from the socket may be invalid, and the socket can't be recovered.
|
|
* - If the socket has data in the send or receive buffer, then this call will fail with
|
|
* {@link #ERROR_SOCKET_NOT_IDLE} and can be retried after the data has been processed.
|
|
* An app could ensure this by using an application-layer protocol to receive acknowledgement
|
|
* that indicates all data has been delivered to server, e.g. HTTP 200 OK.
|
|
* Then the app could go into keepalive mode after reading all remaining data within the
|
|
* acknowledgement.
|
|
*/
|
|
@Override
|
|
protected void startImpl(int intervalSec) {
|
|
mExecutor.execute(() -> {
|
|
try {
|
|
mService.startTcpKeepalive(mNetwork, mPfd, intervalSec, mCallback);
|
|
} catch (RemoteException e) {
|
|
Log.e(TAG, "Error starting packet keepalive: ", e);
|
|
throw e.rethrowFromSystemServer();
|
|
}
|
|
});
|
|
}
|
|
|
|
@Override
|
|
protected void stopImpl() {
|
|
mExecutor.execute(() -> {
|
|
try {
|
|
if (mSlot != null) {
|
|
mService.stopKeepalive(mNetwork, mSlot);
|
|
}
|
|
} catch (RemoteException e) {
|
|
Log.e(TAG, "Error stopping packet keepalive: ", e);
|
|
throw e.rethrowFromSystemServer();
|
|
}
|
|
});
|
|
}
|
|
}
|