Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Split out the nsd API surface and use framework-connectivity-tiramisu

Browse Source 
- Split out nsd APIs and hidden APIs to Connectivity module.
- Keep the all files in f/b/packages/Connectivity-T and add
  framework-connectivity-tiramisu library on p/m/Connectivity.
  Then make framework to use this module library.
- Remove NsdService from SystemServer which will register from
  ConnectivityServiceInitializer

Bug: 206893064
Test: m online-sdk-dev-docs
Test: atest FrameworksNetTests CtsNetTestCases
CTS-Coverage-Bug: 207804007
Change-Id: I72c7de124b9cc53f2263bd452ecd5f39e88e485b
This commit is contained in:
paulhu
2021-12-14 23:09:55 +08:00
parent ca3f277231
commit f45fe96a54
11 changed files with 38 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Android.bp
View File

@@ -148,6 +148,7 @@ java_library {
"android.net.ipsec.ike.stubs.module_lib",
"framework-appsearch.stubs.module_lib",
"framework-connectivity.stubs.module_lib",
"framework-connectivity-tiramisu.stubs.module_lib",
"framework-graphics.stubs.module_lib",
"framework-media.stubs.module_lib",
"framework-mediaprovider.stubs.module_lib",
@@ -173,6 +174,7 @@ java_library {
"framework-minus-apex",
"framework-appsearch.impl",
"framework-connectivity.impl",
"framework-connectivity-tiramisu.impl",
"framework-graphics.impl",
"framework-mediaprovider.impl",
"framework-permission.impl",

3
ApiDocs.bp
View File

@@ -118,6 +118,7 @@ stubs_defaults {
srcs: [
":framework-appsearch-sources",
":framework-connectivity-sources",
":framework-connectivity-tiramisu-updatable-sources",
":framework-graphics-srcs",
":framework-mediaprovider-sources",
":framework-nearby-sources",
@@ -164,6 +165,7 @@ droidstubs {
":android.net.ipsec.ike{.public.stubs.source}",
":framework-appsearch{.public.stubs.source}",
":framework-connectivity{.public.stubs.source}",
":framework-connectivity-tiramisu{.public.stubs.source}",
":framework-graphics{.public.stubs.source}",
":framework-media{.public.stubs.source}",
":framework-mediaprovider{.public.stubs.source}",
@@ -204,6 +206,7 @@ genrule {
":art.module.public.api{.public.annotations.zip}",
":framework-appsearch{.public.annotations.zip}",
":framework-connectivity{.public.annotations.zip}",
":framework-connectivity-tiramisu{.public.annotations.zip}",
":framework-graphics{.public.annotations.zip}",
":framework-media{.public.annotations.zip}",
":framework-mediaprovider{.public.annotations.zip}",

2
StubLibraries.bp
View File

@@ -241,6 +241,7 @@ modules_public_stubs = [
"conscrypt.module.public.api.stubs",
"framework-appsearch.stubs",
"framework-connectivity.stubs",
"framework-connectivity-tiramisu.stubs",
"framework-graphics.stubs",
"framework-media.stubs",
"framework-mediaprovider.stubs",
@@ -263,6 +264,7 @@ modules_system_stubs = [
"conscrypt.module.public.api.stubs", // Only has public stubs
"framework-appsearch.stubs.system",
"framework-connectivity.stubs.system",
"framework-connectivity-tiramisu.stubs.system",
"framework-graphics.stubs.system",
"framework-media.stubs.system",
"framework-mediaprovider.stubs.system",

8
api/Android.bp
View File

@@ -97,6 +97,7 @@ genrule {
":conscrypt.module.public.api{.public.api.txt}",
":framework-appsearch{.public.api.txt}",
":framework-connectivity{.public.api.txt}",
":framework-connectivity-tiramisu{.public.api.txt}",
":framework-graphics{.public.api.txt}",
":framework-media{.public.api.txt}",
":framework-mediaprovider{.public.api.txt}",
@@ -159,6 +160,7 @@ genrule {
":conscrypt.module.public.api{.public.stubs.source}",
":framework-appsearch{.public.stubs.source}",
":framework-connectivity{.public.stubs.source}",
":framework-connectivity-tiramisu{.public.stubs.source}",
":framework-graphics{.public.stubs.source}",
":framework-media{.public.stubs.source}",
":framework-mediaprovider{.public.stubs.source}",
@@ -188,6 +190,7 @@ genrule {
":conscrypt.module.public.api{.public.removed-api.txt}",
":framework-appsearch{.public.removed-api.txt}",
":framework-connectivity{.public.removed-api.txt}",
":framework-connectivity-tiramisu{.public.removed-api.txt}",
":framework-graphics{.public.removed-api.txt}",
":framework-media{.public.removed-api.txt}",
":framework-mediaprovider{.public.removed-api.txt}",
@@ -231,6 +234,7 @@ genrule {
":android.net.ipsec.ike{.system.api.txt}",
":framework-appsearch{.system.api.txt}",
":framework-connectivity{.system.api.txt}",
":framework-connectivity-tiramisu{.system.api.txt}",
":framework-graphics{.system.api.txt}",
":framework-media{.system.api.txt}",
":framework-mediaprovider{.system.api.txt}",
@@ -292,6 +296,7 @@ genrule {
":android.net.ipsec.ike{.system.removed-api.txt}",
":framework-appsearch{.system.removed-api.txt}",
":framework-connectivity{.system.removed-api.txt}",
":framework-connectivity-tiramisu{.system.removed-api.txt}",
":framework-graphics{.system.removed-api.txt}",
":framework-media{.system.removed-api.txt}",
":framework-mediaprovider{.system.removed-api.txt}",
@@ -335,6 +340,7 @@ genrule {
":android.net.ipsec.ike{.module-lib.api.txt}",
":framework-appsearch{.module-lib.api.txt}",
":framework-connectivity{.module-lib.api.txt}",
":framework-connectivity-tiramisu{.module-lib.api.txt}",
":framework-graphics{.module-lib.api.txt}",
":framework-media{.module-lib.api.txt}",
":framework-mediaprovider{.module-lib.api.txt}",
@@ -398,6 +404,7 @@ genrule {
":android.net.ipsec.ike{.module-lib.removed-api.txt}",
":framework-appsearch{.module-lib.removed-api.txt}",
":framework-connectivity{.module-lib.removed-api.txt}",
":framework-connectivity-tiramisu{.module-lib.removed-api.txt}",
":framework-graphics{.module-lib.removed-api.txt}",
":framework-media{.module-lib.removed-api.txt}",
":framework-mediaprovider{.module-lib.removed-api.txt}",
@@ -519,6 +526,7 @@ genrule {
":conscrypt.module.public.api.stubs{.jar}",
":framework-appsearch.stubs{.jar}",
":framework-connectivity.stubs{.jar}",
":framework-connectivity-tiramisu.stubs{.jar}",
":framework-graphics.stubs{.jar}",
":framework-media.stubs{.jar}",
":framework-mediaprovider.stubs{.jar}",

87
boot/hiddenapi/hiddenapi-max-target-o.txt
View File

@@ -36441,93 +36441,6 @@ Landroid/net/MobileLinkQualityInfo;->mLteRssnr:I
Landroid/net/MobileLinkQualityInfo;->mLteSignalStrength:I
Landroid/net/MobileLinkQualityInfo;->mMobileNetworkType:I
Landroid/net/MobileLinkQualityInfo;->mRssi:I
Landroid/net/nsd/DnsSdTxtRecord;-><init>()V
Landroid/net/nsd/DnsSdTxtRecord;-><init>(Landroid/net/nsd/DnsSdTxtRecord;)V
Landroid/net/nsd/DnsSdTxtRecord;-><init>([B)V
Landroid/net/nsd/DnsSdTxtRecord;->contains(Ljava/lang/String;)Z
Landroid/net/nsd/DnsSdTxtRecord;->CREATOR:Landroid/os/Parcelable$Creator;
Landroid/net/nsd/DnsSdTxtRecord;->get(Ljava/lang/String;)Ljava/lang/String;
Landroid/net/nsd/DnsSdTxtRecord;->getKey(I)Ljava/lang/String;
Landroid/net/nsd/DnsSdTxtRecord;->getRawData()[B
Landroid/net/nsd/DnsSdTxtRecord;->getValue(I)[B
Landroid/net/nsd/DnsSdTxtRecord;->getValue(Ljava/lang/String;)[B
Landroid/net/nsd/DnsSdTxtRecord;->getValueAsString(I)Ljava/lang/String;
Landroid/net/nsd/DnsSdTxtRecord;->insert([B[BI)V
Landroid/net/nsd/DnsSdTxtRecord;->keyCount()I
Landroid/net/nsd/DnsSdTxtRecord;->mData:[B
Landroid/net/nsd/DnsSdTxtRecord;->mSeperator:B
Landroid/net/nsd/DnsSdTxtRecord;->remove(Ljava/lang/String;)I
Landroid/net/nsd/DnsSdTxtRecord;->set(Ljava/lang/String;Ljava/lang/String;)V
Landroid/net/nsd/DnsSdTxtRecord;->size()I
Landroid/net/nsd/INsdManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
Landroid/net/nsd/INsdManager$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;
Landroid/net/nsd/INsdManager$Stub$Proxy;->getMessenger()Landroid/os/Messenger;
Landroid/net/nsd/INsdManager$Stub$Proxy;->mRemote:Landroid/os/IBinder;
Landroid/net/nsd/INsdManager$Stub$Proxy;->setEnabled(Z)V
Landroid/net/nsd/INsdManager$Stub;-><init>()V
Landroid/net/nsd/INsdManager$Stub;->DESCRIPTOR:Ljava/lang/String;
Landroid/net/nsd/INsdManager$Stub;->TRANSACTION_getMessenger:I
Landroid/net/nsd/INsdManager$Stub;->TRANSACTION_setEnabled:I
Landroid/net/nsd/INsdManager;->setEnabled(Z)V
Landroid/net/nsd/NsdManager;-><init>(Landroid/content/Context;Landroid/net/nsd/INsdManager;)V
Landroid/net/nsd/NsdManager;->BASE:I
Landroid/net/nsd/NsdManager;->checkListener(Ljava/lang/Object;)V
Landroid/net/nsd/NsdManager;->checkProtocol(I)V
Landroid/net/nsd/NsdManager;->checkServiceInfo(Landroid/net/nsd/NsdServiceInfo;)V
Landroid/net/nsd/NsdManager;->DBG:Z
Landroid/net/nsd/NsdManager;->DISABLE:I
Landroid/net/nsd/NsdManager;->disconnect()V
Landroid/net/nsd/NsdManager;->DISCOVER_SERVICES:I
Landroid/net/nsd/NsdManager;->DISCOVER_SERVICES_FAILED:I
Landroid/net/nsd/NsdManager;->DISCOVER_SERVICES_STARTED:I
Landroid/net/nsd/NsdManager;->ENABLE:I
Landroid/net/nsd/NsdManager;->EVENT_NAMES:Landroid/util/SparseArray;
Landroid/net/nsd/NsdManager;->fatal(Ljava/lang/String;)V
Landroid/net/nsd/NsdManager;->FIRST_LISTENER_KEY:I
Landroid/net/nsd/NsdManager;->getListenerKey(Ljava/lang/Object;)I
Landroid/net/nsd/NsdManager;->getMessenger()Landroid/os/Messenger;
Landroid/net/nsd/NsdManager;->getNsdServiceInfoType(Landroid/net/nsd/NsdServiceInfo;)Ljava/lang/String;
Landroid/net/nsd/NsdManager;->init()V
Landroid/net/nsd/NsdManager;->mAsyncChannel:Lcom/android/internal/util/AsyncChannel;
Landroid/net/nsd/NsdManager;->mConnected:Ljava/util/concurrent/CountDownLatch;
Landroid/net/nsd/NsdManager;->mContext:Landroid/content/Context;
Landroid/net/nsd/NsdManager;->mHandler:Landroid/net/nsd/NsdManager$ServiceHandler;
Landroid/net/nsd/NsdManager;->mListenerKey:I
Landroid/net/nsd/NsdManager;->mListenerMap:Landroid/util/SparseArray;
Landroid/net/nsd/NsdManager;->mMapLock:Ljava/lang/Object;
Landroid/net/nsd/NsdManager;->mService:Landroid/net/nsd/INsdManager;
Landroid/net/nsd/NsdManager;->mServiceMap:Landroid/util/SparseArray;
Landroid/net/nsd/NsdManager;->nameOf(I)Ljava/lang/String;
Landroid/net/nsd/NsdManager;->NATIVE_DAEMON_EVENT:I
Landroid/net/nsd/NsdManager;->nextListenerKey()I
Landroid/net/nsd/NsdManager;->putListener(Ljava/lang/Object;Landroid/net/nsd/NsdServiceInfo;)I
Landroid/net/nsd/NsdManager;->REGISTER_SERVICE:I
Landroid/net/nsd/NsdManager;->REGISTER_SERVICE_FAILED:I
Landroid/net/nsd/NsdManager;->REGISTER_SERVICE_SUCCEEDED:I
Landroid/net/nsd/NsdManager;->removeListener(I)V
Landroid/net/nsd/NsdManager;->RESOLVE_SERVICE:I
Landroid/net/nsd/NsdManager;->RESOLVE_SERVICE_FAILED:I
Landroid/net/nsd/NsdManager;->RESOLVE_SERVICE_SUCCEEDED:I
Landroid/net/nsd/NsdManager;->SERVICE_FOUND:I
Landroid/net/nsd/NsdManager;->SERVICE_LOST:I
Landroid/net/nsd/NsdManager;->setEnabled(Z)V
Landroid/net/nsd/NsdManager;->STOP_DISCOVERY:I
Landroid/net/nsd/NsdManager;->STOP_DISCOVERY_FAILED:I
Landroid/net/nsd/NsdManager;->STOP_DISCOVERY_SUCCEEDED:I
Landroid/net/nsd/NsdManager;->TAG:Ljava/lang/String;
Landroid/net/nsd/NsdManager;->UNREGISTER_SERVICE:I
Landroid/net/nsd/NsdManager;->UNREGISTER_SERVICE_FAILED:I
Landroid/net/nsd/NsdManager;->UNREGISTER_SERVICE_SUCCEEDED:I
Landroid/net/nsd/NsdServiceInfo;-><init>(Ljava/lang/String;Ljava/lang/String;)V
Landroid/net/nsd/NsdServiceInfo;->getTxtRecord()[B
Landroid/net/nsd/NsdServiceInfo;->getTxtRecordSize()I
Landroid/net/nsd/NsdServiceInfo;->mHost:Ljava/net/InetAddress;
Landroid/net/nsd/NsdServiceInfo;->mPort:I
Landroid/net/nsd/NsdServiceInfo;->mServiceName:Ljava/lang/String;
Landroid/net/nsd/NsdServiceInfo;->mServiceType:Ljava/lang/String;
Landroid/net/nsd/NsdServiceInfo;->mTxtRecord:Landroid/util/ArrayMap;
Landroid/net/nsd/NsdServiceInfo;->setTxtRecords(Ljava/lang/String;)V
Landroid/net/nsd/NsdServiceInfo;->TAG:Ljava/lang/String;
Landroid/net/PacProxySelector;-><init>()V
Landroid/net/PacProxySelector;->mDefaultList:Ljava/util/List;
Landroid/net/PacProxySelector;->mProxyService:Lcom/android/net/IProxyService;

1
boot/hiddenapi/hiddenapi-max-target-r-loprio.txt
View File

@@ -21,7 +21,6 @@ Landroid/Manifest$permission;->CAPTURE_VIDEO_OUTPUT:Ljava/lang/String;
Landroid/Manifest$permission;->READ_FRAME_BUFFER:Ljava/lang/String;
Landroid/media/IVolumeController$Stub;->asInterface(Landroid/os/IBinder;)Landroid/media/IVolumeController;
Landroid/net/INetworkPolicyListener$Stub;-><init>()V
Landroid/net/nsd/INsdManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/nsd/INsdManager;
Landroid/net/sip/ISipSession$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/sip/ISipSession;
Landroid/nfc/INfcAdapter$Stub;->TRANSACTION_enable:I
Landroid/os/IPowerManager$Stub;->TRANSACTION_acquireWakeLock:I

59
core/api/current.txt
View File

@@ -27361,65 +27361,6 @@ package android.net.http {
}
package android.net.nsd {
public final class NsdManager {
method public void discoverServices(String, int, android.net.nsd.NsdManager.DiscoveryListener);
method public void registerService(android.net.nsd.NsdServiceInfo, int, android.net.nsd.NsdManager.RegistrationListener);
method public void resolveService(android.net.nsd.NsdServiceInfo, android.net.nsd.NsdManager.ResolveListener);
method public void stopServiceDiscovery(android.net.nsd.NsdManager.DiscoveryListener);
method public void unregisterService(android.net.nsd.NsdManager.RegistrationListener);
field public static final String ACTION_NSD_STATE_CHANGED = "android.net.nsd.STATE_CHANGED";
field public static final String EXTRA_NSD_STATE = "nsd_state";
field public static final int FAILURE_ALREADY_ACTIVE = 3; // 0x3
field public static final int FAILURE_INTERNAL_ERROR = 0; // 0x0
field public static final int FAILURE_MAX_LIMIT = 4; // 0x4
field public static final int NSD_STATE_DISABLED = 1; // 0x1
field public static final int NSD_STATE_ENABLED = 2; // 0x2
field public static final int PROTOCOL_DNS_SD = 1; // 0x1
}
public static interface NsdManager.DiscoveryListener {
method public void onDiscoveryStarted(String);
method public void onDiscoveryStopped(String);
method public void onServiceFound(android.net.nsd.NsdServiceInfo);
method public void onServiceLost(android.net.nsd.NsdServiceInfo);
method public void onStartDiscoveryFailed(String, int);
method public void onStopDiscoveryFailed(String, int);
}
public static interface NsdManager.RegistrationListener {
method public void onRegistrationFailed(android.net.nsd.NsdServiceInfo, int);
method public void onServiceRegistered(android.net.nsd.NsdServiceInfo);
method public void onServiceUnregistered(android.net.nsd.NsdServiceInfo);
method public void onUnregistrationFailed(android.net.nsd.NsdServiceInfo, int);
}
public static interface NsdManager.ResolveListener {
method public void onResolveFailed(android.net.nsd.NsdServiceInfo, int);
method public void onServiceResolved(android.net.nsd.NsdServiceInfo);
}
public final class NsdServiceInfo implements android.os.Parcelable {
ctor public NsdServiceInfo();
method public int describeContents();
method public java.util.Map<java.lang.String,byte[]> getAttributes();
method public java.net.InetAddress getHost();
method public int getPort();
method public String getServiceName();
method public String getServiceType();
method public void removeAttribute(String);
method public void setAttribute(String, String);
method public void setHost(java.net.InetAddress);
method public void setPort(int);
method public void setServiceName(String);
method public void setServiceType(String);
method public void writeToParcel(android.os.Parcel, int);
field @NonNull public static final android.os.Parcelable.Creator<android.net.nsd.NsdServiceInfo> CREATOR;
}
}
package android.net.rtp {
@Deprecated public class AudioCodec {

4
core/api/module-lib-current.txt
View File

@@ -215,10 +215,6 @@ package android.media.session {
package android.net {
public final class ConnectivityFrameworkInitializerTiramisu {
method public static void registerServiceWrappers();
}
public final class EthernetNetworkSpecifier extends android.net.NetworkSpecifier implements android.os.Parcelable {
ctor public EthernetNetworkSpecifier(@NonNull String);
method public int describeContents();

14
packages/ConnectivityT/framework-t/Android.bp
View File

@@ -132,8 +132,18 @@ filegroup {
srcs: [
":framework-connectivity-ipsec-sources",
":framework-connectivity-netstats-sources",
":framework-connectivity-nsd-sources",
":framework-connectivity-tiramisu-internal-sources",
],
visibility: ["//frameworks/base"],
}
filegroup {
name: "framework-connectivity-tiramisu-updatable-sources",
srcs: [
":framework-connectivity-nsd-sources",
":framework-connectivity-tiramisu-internal-sources",
],
visibility: [
"//frameworks/base",
"//packages/modules/Connectivity:__subpackages__",
],
}

12
packages/ConnectivityT/service/Android.bp
View File

@@ -68,8 +68,18 @@ filegroup {
srcs: [
":services.connectivity-ipsec-sources",
":services.connectivity-netstats-sources",
":services.connectivity-nsd-sources",
],
path: "src",
visibility: ["//frameworks/base/services/core"],
}
filegroup {
name: "services.connectivity-tiramisu-updatable-sources",
srcs: [
":services.connectivity-nsd-sources",
],
path: "src",
visibility: [
"//packages/modules/Connectivity:__subpackages__",
],
}

11
services/java/com/android/server/SystemServer.java
View File

@@ -1381,7 +1381,6 @@ public final class SystemServer implements Dumpable {
VcnManagementService vcnManagement = null;
NetworkStatsService networkStats = null;
NetworkPolicyManagerService networkPolicy = null;
NsdService serviceDiscovery = null;
WindowManagerService wm = null;
SerialService serial = null;
NetworkTimeUpdateService networkTimeUpdater = null;
@@ -1997,16 +1996,6 @@ public final class SystemServer implements Dumpable {
}
t.traceEnd();
t.traceBegin("StartNsdService");
try {
serviceDiscovery = NsdService.create(context);
ServiceManager.addService(
Context.NSD_SERVICE, serviceDiscovery);
} catch (Throwable e) {
reportWtf("starting Service Discovery Service", e);
}
t.traceEnd();
t.traceBegin("StartSystemUpdateManagerService");
try {
ServiceManager.addService(Context.SYSTEM_UPDATE_SERVICE,