Drop prebuilt files to android source tree. am: 961febaf01 am: 6964e54c9c

Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/Connectivity/+/18467375

Change-Id: I6cb8a019401dd1b72fbaee4ee1f3f39de18ab71e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

5 files changed, 23 insertions, 29 deletions

diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index fb30dd1..8ba9c70 100644
--- a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
@@ -1,8 +1,8 @@
 drops {
   android_build_drop {
-    build_id: "T1003987"
+    build_id: "T1004024"
     target: "train_build"
-    source_file: "mainline-sdks/for-latest-build/current/com.google.android.tethering/sdk/tethering-module-sdk-current.zip"
+    source_file: "mainline-sdks/for-Tiramisu-build/current/com.google.android.tethering/sdk/tethering-module-sdk-current.zip"
   }
   dest_file: "current/current.zip"
   version: ""
diff --git a/current/hiddenapi/filtered-flags.csv b/current/hiddenapi/filtered-flags.csv
index 153a3fb..03c1132 100644
--- a/current/hiddenapi/filtered-flags.csv
+++ b/current/hiddenapi/filtered-flags.csv
@@ -917,12 +917,10 @@ Landroid/net/DscpPolicy;->getSourcePort()I,sdk,system-api,test-api
 Landroid/net/DscpPolicy;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/DscpPolicy;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/DscpPolicy;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/net/EthernetManager$$ExternalSyntheticLambda0;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/EthernetManager$$ExternalSyntheticLambda1;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/EthernetManager$1$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/EthernetManager$1$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/EthernetManager$2$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/EthernetManager$2$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/EthernetManager$3$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/EthernetManager$Listener;->onAvailabilityChanged(Ljava/lang/String;Z)V,max-target-r
 Landroid/net/EthernetManager$NetworkInterfaceOutcomeReceiver$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/EthernetManager$NetworkInterfaceOutcomeReceiver$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
@@ -940,7 +938,6 @@ Landroid/net/EthernetManager;->getConfiguration(Ljava/lang/String;)Landroid/net/
 Landroid/net/EthernetManager;->isAvailable()Z,max-target-r
 Landroid/net/EthernetManager;->isAvailable(Ljava/lang/String;)Z,max-target-r
 Landroid/net/EthernetManager;->mService:Landroid/net/IEthernetManager;,lo-prio,max-target-o
-Landroid/net/EthernetManager;->mServiceListener:Landroid/net/IEthernetServiceListener$Stub;,lo-prio,max-target-o
 Landroid/net/EthernetManager;->removeListener(Landroid/net/EthernetManager$Listener;)V,max-target-r
 Landroid/net/EthernetManager;->requestTetheredInterface(Ljava/util/concurrent/Executor;Landroid/net/EthernetManager$TetheredInterfaceCallback;)Landroid/net/EthernetManager$TetheredInterfaceRequest;,sdk,system-api,test-api
 Landroid/net/EthernetManager;->setConfiguration(Ljava/lang/String;Landroid/net/IpConfiguration;)V,max-target-r
@@ -2566,7 +2563,6 @@ Landroid/net/NetworkStatsHistory;->recordData(JJJJ)V,lo-prio,max-target-o
 Landroid/net/NetworkStatsHistory;->recordData(JJLandroid/net/NetworkStats$Entry;)V,lo-prio,max-target-o
 Landroid/net/NetworkStatsHistory;->recordEntireHistory(Landroid/net/NetworkStatsHistory;)V,unsupported
 Landroid/net/NetworkStatsHistory;->recordHistory(Landroid/net/NetworkStatsHistory;JJ)V,lo-prio,max-target-o
-Landroid/net/NetworkStatsHistory;->removeBucketsBefore(J)V,lo-prio,max-target-o
 Landroid/net/NetworkStatsHistory;->rxBytes:[J,lo-prio,max-target-o
 Landroid/net/NetworkStatsHistory;->rxPackets:[J,lo-prio,max-target-o
 Landroid/net/NetworkStatsHistory;->setLong([JIJ)V,lo-prio,max-target-o
diff --git a/current/hiddenapi/filtered-stub-flags.csv b/current/hiddenapi/filtered-stub-flags.csv
index 2aad0df..8632d55 100644
--- a/current/hiddenapi/filtered-stub-flags.csv
+++ b/current/hiddenapi/filtered-stub-flags.csv
@@ -672,12 +672,10 @@ Landroid/net/DscpPolicy;->getSourcePort()I,system-api,test-api
 Landroid/net/DscpPolicy;->hashCode()I,core-platform-api,public-api,system-api,test-api
 Landroid/net/DscpPolicy;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Landroid/net/DscpPolicy;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/net/EthernetManager$$ExternalSyntheticLambda0;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
-Landroid/net/EthernetManager$$ExternalSyntheticLambda1;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
 Landroid/net/EthernetManager$1$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/net/EthernetManager$1$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/EthernetManager$2$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/EthernetManager$2$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/net/EthernetManager$3$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/EthernetManager$NetworkInterfaceOutcomeReceiver$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/EthernetManager$NetworkInterfaceOutcomeReceiver$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/EthernetManager$TetheredInterfaceCallback;->onAvailable(Ljava/lang/String;)V,system-api,test-api
diff --git a/current/hiddenapi/index.csv b/current/hiddenapi/index.csv
index 827349f..5169710 100644
--- a/current/hiddenapi/index.csv
+++ b/current/hiddenapi/index.csv
@@ -45,15 +45,15 @@ Landroid/net/ConnectivityManager;->setUsbTethering(Z)I,packages/modules/Connecti
 Landroid/net/ConnectivityManager;->getLastTetherError(Ljava/lang/String;)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3180,5,3180,88,maxTargetSdk=30&trackingBug=170729553L
 Landroid/net/ConnectivityManager;->isNetworkSupported(I)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3430,5,3430,88,maxTargetSdk=28&trackingBug=130143562L
 Landroid/net/ConnectivityManager;->setProcessDefaultNetworkForHostResolution(Landroid/net/Network;)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,5224,5,5224,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/EthernetManager$Listener;->onAvailabilityChanged(Ljava/lang/String;Z)V,packages/modules/Connectivity/framework-t/src/android/net/EthernetManager.java,204,9,204,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/EthernetManager;->getConfiguration(Ljava/lang/String;)Landroid/net/IpConfiguration;,packages/modules/Connectivity/framework-t/src/android/net/EthernetManager.java,231,5,231,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/EthernetManager;->setConfiguration(Ljava/lang/String;Landroid/net/IpConfiguration;)V,packages/modules/Connectivity/framework-t/src/android/net/EthernetManager.java,244,5,244,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/EthernetManager;->isAvailable()Z,packages/modules/Connectivity/framework-t/src/android/net/EthernetManager.java,257,5,257,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/EthernetManager;->isAvailable(Ljava/lang/String;)Z,packages/modules/Connectivity/framework-t/src/android/net/EthernetManager.java,268,5,268,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/EthernetManager;->addListener(Landroid/net/EthernetManager$Listener;)V,packages/modules/Connectivity/framework-t/src/android/net/EthernetManager.java,285,5,285,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/EthernetManager;->addListener(Landroid/net/EthernetManager$Listener;Ljava/util/concurrent/Executor;)V,packages/modules/Connectivity/framework-t/src/android/net/EthernetManager.java,299,5,299,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/EthernetManager;->getAvailableInterfaces()[Ljava/lang/String;,packages/modules/Connectivity/framework-t/src/android/net/EthernetManager.java,348,5,348,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/EthernetManager;->removeListener(Landroid/net/EthernetManager$Listener;)V,packages/modules/Connectivity/framework-t/src/android/net/EthernetManager.java,389,5,389,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/EthernetManager$Listener;->onAvailabilityChanged(Ljava/lang/String;Z)V,packages/modules/Connectivity/framework-t/src/android/net/EthernetManager.java,167,9,167,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/EthernetManager;->getConfiguration(Ljava/lang/String;)Landroid/net/IpConfiguration;,packages/modules/Connectivity/framework-t/src/android/net/EthernetManager.java,194,5,194,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/EthernetManager;->setConfiguration(Ljava/lang/String;Landroid/net/IpConfiguration;)V,packages/modules/Connectivity/framework-t/src/android/net/EthernetManager.java,207,5,207,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/EthernetManager;->isAvailable()Z,packages/modules/Connectivity/framework-t/src/android/net/EthernetManager.java,220,5,220,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/EthernetManager;->isAvailable(Ljava/lang/String;)Z,packages/modules/Connectivity/framework-t/src/android/net/EthernetManager.java,231,5,231,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/EthernetManager;->addListener(Landroid/net/EthernetManager$Listener;)V,packages/modules/Connectivity/framework-t/src/android/net/EthernetManager.java,248,5,248,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/EthernetManager;->addListener(Landroid/net/EthernetManager$Listener;Ljava/util/concurrent/Executor;)V,packages/modules/Connectivity/framework-t/src/android/net/EthernetManager.java,262,5,262,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/EthernetManager;->getAvailableInterfaces()[Ljava/lang/String;,packages/modules/Connectivity/framework-t/src/android/net/EthernetManager.java,321,5,321,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/EthernetManager;->removeListener(Landroid/net/EthernetManager$Listener;)V,packages/modules/Connectivity/framework-t/src/android/net/EthernetManager.java,361,5,361,88,maxTargetSdk=30&trackingBug=170729553L
 Landroid/net/IConnectivityManager;->getActiveNetworkInfo()Landroid/net/NetworkInfo;,packages/modules/Connectivity/framework/src/android/net/IConnectivityManager.aidl,60,1,60,25,
 Landroid/net/IConnectivityManager;->getNetworkInfo(I)Landroid/net/NetworkInfo;,packages/modules/Connectivity/framework/src/android/net/IConnectivityManager.aidl,63,1,63,44,maxTargetSdk=28
 Landroid/net/IConnectivityManager;->getAllNetworkInfo()[Landroid/net/NetworkInfo;,packages/modules/Connectivity/framework/src/android/net/IConnectivityManager.aidl,66,1,66,25,
@@ -94,12 +94,12 @@ Landroid/net/LinkProperties;->hasIPv6DefaultRoute()Z,packages/modules/Connectivi
 Landroid/net/LinkProperties;->hasIPv4DnsServer()Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1214,5,1214,63,maxTargetSdk=28
 Landroid/net/LinkProperties;->hasIPv6DnsServer()Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1242,5,1242,63,maxTargetSdk=28
 Landroid/net/LinkProperties;->isIPv6Provisioned()Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1312,5,1312,63,maxTargetSdk=28
-Landroid/net/LinkProperties;->isIdenticalInterfaceName(Landroid/net/LinkProperties;)Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1375,5,1375,25,
-Landroid/net/LinkProperties;->isIdenticalAddresses(Landroid/net/LinkProperties;)Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1398,5,1398,25,
-Landroid/net/LinkProperties;->isIdenticalDnses(Landroid/net/LinkProperties;)Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1410,5,1410,25,
-Landroid/net/LinkProperties;->isIdenticalRoutes(Landroid/net/LinkProperties;)Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1463,5,1463,25,
-Landroid/net/LinkProperties;->isIdenticalHttpProxy(Landroid/net/LinkProperties;)Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1475,5,1475,88,maxTargetSdk=28&trackingBug=115609023L
-Landroid/net/LinkProperties;->isIdenticalStackedLinks(Landroid/net/LinkProperties;)Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1487,5,1487,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/LinkProperties;->isIdenticalInterfaceName(Landroid/net/LinkProperties;)Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1390,5,1390,25,
+Landroid/net/LinkProperties;->isIdenticalAddresses(Landroid/net/LinkProperties;)Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1413,5,1413,25,
+Landroid/net/LinkProperties;->isIdenticalDnses(Landroid/net/LinkProperties;)Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1425,5,1425,25,
+Landroid/net/LinkProperties;->isIdenticalRoutes(Landroid/net/LinkProperties;)Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1478,5,1478,25,
+Landroid/net/LinkProperties;->isIdenticalHttpProxy(Landroid/net/LinkProperties;)Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1490,5,1490,88,maxTargetSdk=28&trackingBug=115609023L
+Landroid/net/LinkProperties;->isIdenticalStackedLinks(Landroid/net/LinkProperties;)Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1502,5,1502,88,maxTargetSdk=30&trackingBug=170729553L
 Landroid/net/MacAddress;->ALL_ZEROS_ADDRESS:Landroid/net/MacAddress;,packages/modules/Connectivity/framework/src/android/net/MacAddress.java,62,5,62,88,maxTargetSdk=30&trackingBug=170729553L
 Landroid/net/Network;->netId:I,packages/modules/Connectivity/framework/src/android/net/Network.java,69,5,69,25,
 Landroid/net/Network;-><init>(I)V,packages/modules/Connectivity/framework/src/android/net/Network.java,115,5,115,88,maxTargetSdk=30&trackingBug=170729553L
@@ -165,9 +165,9 @@ Landroid/net/NetworkStatsHistory;->getEnd()J,packages/modules/Connectivity/frame
 Landroid/net/NetworkStatsHistory;->getIndexBefore(J)I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,421,5,421,88,maxTargetSdk=30&trackingBug=170729553L
 Landroid/net/NetworkStatsHistory;->getValues(ILandroid/net/NetworkStatsHistory$Entry;)Landroid/net/NetworkStatsHistory$Entry;,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,451,5,451,88,maxTargetSdk=30&trackingBug=170729553L
 Landroid/net/NetworkStatsHistory;->recordEntireHistory(Landroid/net/NetworkStatsHistory;)V,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,577,5,577,25,
-Landroid/net/NetworkStatsHistory;->getValues(JJLandroid/net/NetworkStatsHistory$Entry;)Landroid/net/NetworkStatsHistory$Entry;,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,727,5,727,25,
-Landroid/net/NetworkStatsHistory;->getValues(JJJLandroid/net/NetworkStatsHistory$Entry;)Landroid/net/NetworkStatsHistory$Entry;,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,742,5,742,25,
-Landroid/net/NetworkStatsHistory;->CREATOR:Landroid/os/Parcelable$Creator;,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,950,5,950,25,
+Landroid/net/NetworkStatsHistory;->getValues(JJLandroid/net/NetworkStatsHistory$Entry;)Landroid/net/NetworkStatsHistory$Entry;,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,729,5,729,25,
+Landroid/net/NetworkStatsHistory;->getValues(JJJLandroid/net/NetworkStatsHistory$Entry;)Landroid/net/NetworkStatsHistory$Entry;,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,744,5,744,25,
+Landroid/net/NetworkStatsHistory;->CREATOR:Landroid/os/Parcelable$Creator;,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,952,5,952,25,
 Landroid/net/NetworkTemplate;->buildTemplateMobileAll(Ljava/lang/String;)Landroid/net/NetworkTemplate;,packages/modules/Connectivity/framework-t/src/android/net/NetworkTemplate.java,192,5,192,25,
 Landroid/net/NetworkTemplate;->buildTemplateMobileWildcard()Landroid/net/NetworkTemplate;,packages/modules/Connectivity/framework-t/src/android/net/NetworkTemplate.java,225,5,225,88,maxTargetSdk=30&trackingBug=170729553L
 Landroid/net/NetworkTemplate;->buildTemplateWifiWildcard()Landroid/net/NetworkTemplate;,packages/modules/Connectivity/framework-t/src/android/net/NetworkTemplate.java,236,5,236,25,
diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt
index bd32ea7..a33e33e 100644
--- a/current/snapshot-creation-build-number.txt
+++ b/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-8559479
\ No newline at end of file
+8598557
\ No newline at end of file