Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 828de7c5 authored by Paul Hu's avatar Paul Hu Committed by Automerger Merge Worker
Browse files

Merge "Split out the nsd API surface and use framework-connectivity-tiramisu" am: f276eba8 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1903750

Change-Id: I0f6ee9fdd4ea40362005da9f279afb90818c8523
parents 8b1a30dc f276eba8

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -145,6 +145,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",

ApiDocs.bp

+1 −0
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ stubs_defaults { 


        ":framework-appsearch-sources",

        ":framework-connectivity-sources",

        ":framework-connectivity-tiramisu-updatable-sources",

        ":framework-graphics-srcs",

        ":framework-mediaprovider-sources",

        ":framework-permission-sources",

StubLibraries.bp

+2 −0
Original line number Diff line number Diff line
@@ -212,6 +212,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",
@@ -231,6 +232,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

+1 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ combined_apis { 
        "conscrypt.module.public.api",

        "framework-appsearch",

        "framework-connectivity",

        "framework-connectivity-tiramisu",

        "framework-graphics",

        "framework-media",

        "framework-mediaprovider",

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;