Move BaseNetdUnsolicitedEventListener to frameworks/libs/net
Move BaseNetdUnsolicitedEventListener to frameworks/libs/net and create a new library - netd-client for using. Also remove netd_aidl_interface-unstable-java since netd-client links to the stable one. Bug: 174837473 Test: Manual test and check the log. Change-Id: Id65142b8c13a6cccbfe387d4ab757967497546e6
This commit is contained in:
@@ -26,7 +26,6 @@ java_defaults {
|
|||||||
],
|
],
|
||||||
static_libs: [
|
static_libs: [
|
||||||
"androidx.annotation_annotation",
|
"androidx.annotation_annotation",
|
||||||
"netd_aidl_interface-unstable-java",
|
|
||||||
"netlink-client",
|
"netlink-client",
|
||||||
// TODO: use networkstack-client instead of just including the AIDL interface
|
// TODO: use networkstack-client instead of just including the AIDL interface
|
||||||
"networkstack-aidl-interfaces-unstable-java",
|
"networkstack-aidl-interfaces-unstable-java",
|
||||||
@@ -34,6 +33,7 @@ java_defaults {
|
|||||||
"android.hardware.tetheroffload.control-V1.0-java",
|
"android.hardware.tetheroffload.control-V1.0-java",
|
||||||
"net-utils-framework-common",
|
"net-utils-framework-common",
|
||||||
"net-utils-device-common",
|
"net-utils-device-common",
|
||||||
|
"netd-client",
|
||||||
],
|
],
|
||||||
libs: [
|
libs: [
|
||||||
"framework-statsd.stubs.module_lib",
|
"framework-statsd.stubs.module_lib",
|
||||||
|
|||||||
@@ -1,75 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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.util;
|
|
||||||
|
|
||||||
import android.net.INetdUnsolicitedEventListener;
|
|
||||||
|
|
||||||
import androidx.annotation.NonNull;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Base {@link INetdUnsolicitedEventListener} that provides no-op implementations which can be
|
|
||||||
* overridden.
|
|
||||||
*/
|
|
||||||
public class BaseNetdUnsolicitedEventListener extends INetdUnsolicitedEventListener.Stub {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onInterfaceClassActivityChanged(boolean isActive, int timerLabel, long timestampNs,
|
|
||||||
int uid) { }
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onQuotaLimitReached(@NonNull String alertName, @NonNull String ifName) { }
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onInterfaceDnsServerInfo(@NonNull String ifName, long lifetimeS,
|
|
||||||
@NonNull String[] servers) { }
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onInterfaceAddressUpdated(@NonNull String addr, String ifName, int flags,
|
|
||||||
int scope) { }
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onInterfaceAddressRemoved(@NonNull String addr, @NonNull String ifName, int flags,
|
|
||||||
int scope) { }
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onInterfaceAdded(@NonNull String ifName) { }
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onInterfaceRemoved(@NonNull String ifName) { }
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onInterfaceChanged(@NonNull String ifName, boolean up) { }
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onInterfaceLinkStateChanged(@NonNull String ifName, boolean up) { }
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onRouteChanged(boolean updated, @NonNull String route, @NonNull String gateway,
|
|
||||||
@NonNull String ifName) { }
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onStrictCleartextDetected(int uid, @NonNull String hex) { }
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getInterfaceVersion() {
|
|
||||||
return INetdUnsolicitedEventListener.VERSION;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getInterfaceHash() {
|
|
||||||
return INetdUnsolicitedEventListener.HASH;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -93,7 +93,6 @@ import android.net.TetheringConfigurationParcel;
|
|||||||
import android.net.TetheringRequestParcel;
|
import android.net.TetheringRequestParcel;
|
||||||
import android.net.ip.IpServer;
|
import android.net.ip.IpServer;
|
||||||
import android.net.shared.NetdUtils;
|
import android.net.shared.NetdUtils;
|
||||||
import android.net.util.BaseNetdUnsolicitedEventListener;
|
|
||||||
import android.net.util.InterfaceSet;
|
import android.net.util.InterfaceSet;
|
||||||
import android.net.util.PrefixUtils;
|
import android.net.util.PrefixUtils;
|
||||||
import android.net.util.SharedLog;
|
import android.net.util.SharedLog;
|
||||||
@@ -132,6 +131,7 @@ import com.android.internal.util.IndentingPrintWriter;
|
|||||||
import com.android.internal.util.MessageUtils;
|
import com.android.internal.util.MessageUtils;
|
||||||
import com.android.internal.util.State;
|
import com.android.internal.util.State;
|
||||||
import com.android.internal.util.StateMachine;
|
import com.android.internal.util.StateMachine;
|
||||||
|
import com.android.net.module.util.BaseNetdUnsolicitedEventListener;
|
||||||
|
|
||||||
import java.io.FileDescriptor;
|
import java.io.FileDescriptor;
|
||||||
import java.io.PrintWriter;
|
import java.io.PrintWriter;
|
||||||
|
|||||||
Reference in New Issue
Block a user