Merge "Split out the nsd API surface and use framework-connectivity-tiramisu" (4090f0da) · Commits · e / os / android_frameworks_base

Android.bp

+2 −0

Original line number	Diff line number	Diff line
		@@ -160,6 +160,7 @@ java_library_with_nonpublic_deps {
		"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",
		@@ -192,6 +193,7 @@ java_library_with_nonpublic_deps {
		"framework-minus-apex",
		"framework-appsearch.impl",
		"framework-connectivity.impl",
		"framework-connectivity-tiramisu.impl",
		"framework-graphics.impl",
		"framework-mediaprovider.impl",
		"framework-permission.impl",

ApiDocs.bp

+3 −0

Original line number	Diff line number	Diff line
		@@ -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}",

StubLibraries.bp

+2 −0

Original line number	Diff line number	Diff line
		@@ -249,6 +249,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",
		@@ -271,6 +272,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",

api/Android.bp

+8 −0

Original line number	Diff line number	Diff line
		@@ -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}",

boot/hiddenapi/hiddenapi-max-target-o.txt

+0 −87

Original line number	Diff line number	Diff line
		@@ -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;