2020-06-15 16:10:01 -07:00
|
|
|
/*
|
|
|
|
|
* Copyright (C) 2020 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.annotation.Nullable;
|
|
|
|
|
import android.telephony.data.EpsBearerQosSessionAttributes;
|
2021-03-15 15:58:11 -07:00
|
|
|
import android.telephony.data.NrQosSessionAttributes;
|
2020-06-15 16:10:01 -07:00
|
|
|
|
|
|
|
|
import com.android.internal.annotations.VisibleForTesting;
|
|
|
|
|
|
|
|
|
|
import java.util.Objects;
|
|
|
|
|
import java.util.concurrent.Executor;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Sends messages from {@link com.android.server.ConnectivityService} to the registered
|
|
|
|
|
* {@link QosCallback}.
|
|
|
|
|
* <p/>
|
|
|
|
|
* This is a satellite class of {@link ConnectivityManager} and not meant
|
|
|
|
|
* to be used in other contexts.
|
|
|
|
|
*
|
|
|
|
|
* @hide
|
|
|
|
|
*/
|
Use jarjar rule generator for connectivity rules
(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
2022-04-20 15:59:16 +09:00
|
|
|
public class QosCallbackConnection extends android.net.IQosCallback.Stub {
|
2020-06-15 16:10:01 -07:00
|
|
|
|
|
|
|
|
@NonNull private final ConnectivityManager mConnectivityManager;
|
|
|
|
|
@Nullable private volatile QosCallback mCallback;
|
|
|
|
|
@NonNull private final Executor mExecutor;
|
|
|
|
|
|
|
|
|
|
@VisibleForTesting
|
|
|
|
|
@Nullable
|
|
|
|
|
public QosCallback getCallback() {
|
|
|
|
|
return mCallback;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* The constructor for the connection
|
|
|
|
|
*
|
|
|
|
|
* @param connectivityManager the mgr that created this connection
|
|
|
|
|
* @param callback the callback to send messages back to
|
|
|
|
|
* @param executor The executor on which the callback will be invoked. The provided
|
|
|
|
|
* {@link Executor} must run callback sequentially, otherwise the order of
|
|
|
|
|
* callbacks cannot be guaranteed.
|
|
|
|
|
*/
|
Use jarjar rule generator for connectivity rules
(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
2022-04-20 15:59:16 +09:00
|
|
|
public QosCallbackConnection(@NonNull final ConnectivityManager connectivityManager,
|
2020-06-15 16:10:01 -07:00
|
|
|
@NonNull final QosCallback callback,
|
|
|
|
|
@NonNull final Executor executor) {
|
|
|
|
|
mConnectivityManager = Objects.requireNonNull(connectivityManager,
|
|
|
|
|
"connectivityManager must be non-null");
|
|
|
|
|
mCallback = Objects.requireNonNull(callback, "callback must be non-null");
|
|
|
|
|
mExecutor = Objects.requireNonNull(executor, "executor must be non-null");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Called when either the {@link EpsBearerQosSessionAttributes} has changed or on the first time
|
|
|
|
|
* the attributes have become available.
|
|
|
|
|
*
|
|
|
|
|
* @param session the session that is now available
|
|
|
|
|
* @param attributes the corresponding attributes of session
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
public void onQosEpsBearerSessionAvailable(@NonNull final QosSession session,
|
|
|
|
|
@NonNull final EpsBearerQosSessionAttributes attributes) {
|
|
|
|
|
|
|
|
|
|
mExecutor.execute(() -> {
|
|
|
|
|
final QosCallback callback = mCallback;
|
|
|
|
|
if (callback != null) {
|
|
|
|
|
callback.onQosSessionAvailable(session, attributes);
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
2021-03-15 15:58:11 -07:00
|
|
|
/**
|
|
|
|
|
* Called when either the {@link NrQosSessionAttributes} has changed or on the first time
|
|
|
|
|
* the attributes have become available.
|
|
|
|
|
*
|
|
|
|
|
* @param session the session that is now available
|
|
|
|
|
* @param attributes the corresponding attributes of session
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
public void onNrQosSessionAvailable(@NonNull final QosSession session,
|
|
|
|
|
@NonNull final NrQosSessionAttributes attributes) {
|
|
|
|
|
|
|
|
|
|
mExecutor.execute(() -> {
|
|
|
|
|
final QosCallback callback = mCallback;
|
|
|
|
|
if (callback != null) {
|
|
|
|
|
callback.onQosSessionAvailable(session, attributes);
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
2020-06-15 16:10:01 -07:00
|
|
|
/**
|
|
|
|
|
* Called when the session is lost.
|
|
|
|
|
*
|
|
|
|
|
* @param session the session that was lost
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
public void onQosSessionLost(@NonNull final QosSession session) {
|
|
|
|
|
mExecutor.execute(() -> {
|
|
|
|
|
final QosCallback callback = mCallback;
|
|
|
|
|
if (callback != null) {
|
|
|
|
|
callback.onQosSessionLost(session);
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Called when there is an error on the registered callback.
|
|
|
|
|
*
|
|
|
|
|
* @param errorType the type of error
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
public void onError(@QosCallbackException.ExceptionType final int errorType) {
|
|
|
|
|
mExecutor.execute(() -> {
|
|
|
|
|
final QosCallback callback = mCallback;
|
|
|
|
|
if (callback != null) {
|
|
|
|
|
// Messages no longer need to be received since there was an error.
|
|
|
|
|
stopReceivingMessages();
|
|
|
|
|
mConnectivityManager.unregisterQosCallback(callback);
|
|
|
|
|
callback.onError(QosCallbackException.createException(errorType));
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* The callback will stop receiving messages.
|
|
|
|
|
* <p/>
|
|
|
|
|
* There are no synchronization guarantees on exactly when the callback will stop receiving
|
|
|
|
|
* messages.
|
|
|
|
|
*/
|
Use jarjar rule generator for connectivity rules
(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
2022-04-20 15:59:16 +09:00
|
|
|
public void stopReceivingMessages() {
|
2020-06-15 16:10:01 -07:00
|
|
|
mCallback = null;
|
|
|
|
|
}
|
|
|
|
|
}
|