DO NOT MERGE Drop prebuilt files to android source tree.

snapshot-creation-build-number.txt

Android.bp

framework-connectivity-removed.txt

framework-connectivity_annotations.zip

framework-tethering.srcjar

framework-connectivity-t-stubs.jar

framework-connectivity-t_annotations.zip

framework-tethering.txt

framework-connectivity.srcjar

framework-tethering-removed.txt

framework-connectivity-stubs.jar

framework-tethering-stubs.jar

framework-connectivity-t.srcjar

framework-tethering_annotations.zip

framework-connectivity.txt

framework-connectivity-t.txt

framework-connectivity-t-removed.txt

framework-connectivity-removed.txt

framework-connectivity_annotations.zip

framework-tethering.srcjar

framework-connectivity-t-stubs.jar

framework-connectivity-t_annotations.zip

framework-tethering.txt

framework-connectivity.srcjar

framework-tethering-removed.txt

framework-connectivity-stubs.jar

framework-tethering-stubs.jar

framework-connectivity-t.srcjar

framework-tethering_annotations.zip

framework-connectivity.txt

framework-connectivity-t.txt

framework-connectivity-t-removed.txt

framework-connectivity-removed.txt

framework-connectivity_annotations.zip

framework-tethering.srcjar

framework-connectivity-t-stubs.jar

framework-connectivity-t_annotations.zip

framework-tethering.txt

framework-connectivity.srcjar

framework-tethering-removed.txt

framework-connectivity-stubs.jar

framework-tethering-stubs.jar

framework-connectivity-t.srcjar

framework-tethering_annotations.zip

framework-connectivity.txt

framework-connectivity-t.txt

framework-connectivity-t-removed.txt

LICENSE

hiddenapi-max-target-r-loprio.txt

hiddenapi-max-target-o-low-priority-tiramisu.txt

index.csv

filtered-stub-flags.csv

hiddenapi-max-target-o-low-priority.txt

hiddenapi-unsupported-tiramisu.txt

annotation-flags.csv

metadata.csv

hiddenapi-unsupported.txt

filtered-flags.csv

signature-patterns.csv

service-connectivity.jar

Built here: ab/T1004113

This build IS suitable for public release.

The change is generated with prebuilt drop tool.

Test: presubmit
Bug: 234586662
Change-Id: I2297836445ba98eca0b9e6d12b4e06848f1278f2

3 files changed, 19 insertions, 19 deletions

diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index 4daa8b8..5a1db42 100644
--- a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
@@ -1,6 +1,6 @@
 drops {
   android_build_drop {
-    build_id: "T1004067"
+    build_id: "T1004113"
     target: "train_build"
     source_file: "mainline-sdks/for-Tiramisu-build/current/com.google.android.tethering/sdk/tethering-module-sdk-current.zip"
   }
diff --git a/current/hiddenapi/index.csv b/current/hiddenapi/index.csv
index ee26e62..ae7c5e2 100644
--- a/current/hiddenapi/index.csv
+++ b/current/hiddenapi/index.csv
@@ -151,23 +151,23 @@ Landroid/net/NetworkStats;->getTotalBytes()J,packages/modules/Connectivity/frame
 Landroid/net/NetworkStats;->getTotal(Landroid/net/NetworkStats$Entry;)Landroid/net/NetworkStats$Entry;,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,966,5,966,25,
 Landroid/net/NetworkStats;->getTotal(Landroid/net/NetworkStats$Entry;I)Landroid/net/NetworkStats$Entry;,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,976,5,976,25,
 Landroid/net/NetworkStats;->getTotalIncludingTags(Landroid/net/NetworkStats$Entry;)Landroid/net/NetworkStats$Entry;,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,991,5,991,25,
-Landroid/net/NetworkStatsHistory$Entry;->bucketDuration:J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,130,9,130,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/NetworkStatsHistory$Entry;->bucketStart:J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,133,9,133,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/NetworkStatsHistory$Entry;->rxBytes:J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,138,9,138,29,
-Landroid/net/NetworkStatsHistory$Entry;->rxPackets:J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,141,9,141,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/NetworkStatsHistory$Entry;->txBytes:J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,144,9,144,29,
-Landroid/net/NetworkStatsHistory$Entry;->txPackets:J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,147,9,147,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/NetworkStatsHistory;-><init>(J)V,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,259,5,259,25,
-Landroid/net/NetworkStatsHistory;-><init>(Landroid/os/Parcel;)V,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,290,5,290,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/NetworkStatsHistory;->size()I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,379,5,379,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/NetworkStatsHistory;->getStart()J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,390,5,390,25,
-Landroid/net/NetworkStatsHistory;->getEnd()J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,400,5,400,25,
-Landroid/net/NetworkStatsHistory;->getIndexBefore(J)I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,422,5,422,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,452,5,452,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/NetworkStatsHistory;->recordEntireHistory(Landroid/net/NetworkStatsHistory;)V,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,578,5,578,25,
-Landroid/net/NetworkStatsHistory;->getValues(JJLandroid/net/NetworkStatsHistory$Entry;)Landroid/net/NetworkStatsHistory$Entry;,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,730,5,730,25,
-Landroid/net/NetworkStatsHistory;->getValues(JJJLandroid/net/NetworkStatsHistory$Entry;)Landroid/net/NetworkStatsHistory$Entry;,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,745,5,745,25,
-Landroid/net/NetworkStatsHistory;->CREATOR:Landroid/os/Parcelable$Creator;,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,972,5,972,25,
+Landroid/net/NetworkStatsHistory$Entry;->bucketDuration:J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,131,9,131,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStatsHistory$Entry;->bucketStart:J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,134,9,134,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStatsHistory$Entry;->rxBytes:J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,139,9,139,29,
+Landroid/net/NetworkStatsHistory$Entry;->rxPackets:J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,142,9,142,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStatsHistory$Entry;->txBytes:J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,145,9,145,29,
+Landroid/net/NetworkStatsHistory$Entry;->txPackets:J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,148,9,148,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStatsHistory;-><init>(J)V,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,282,5,282,25,
+Landroid/net/NetworkStatsHistory;-><init>(Landroid/os/Parcel;)V,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,313,5,313,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStatsHistory;->size()I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,402,5,402,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStatsHistory;->getStart()J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,413,5,413,25,
+Landroid/net/NetworkStatsHistory;->getEnd()J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,423,5,423,25,
+Landroid/net/NetworkStatsHistory;->getIndexBefore(J)I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,445,5,445,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,475,5,475,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStatsHistory;->recordEntireHistory(Landroid/net/NetworkStatsHistory;)V,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,601,5,601,25,
+Landroid/net/NetworkStatsHistory;->getValues(JJLandroid/net/NetworkStatsHistory$Entry;)Landroid/net/NetworkStatsHistory$Entry;,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,753,5,753,25,
+Landroid/net/NetworkStatsHistory;->getValues(JJJLandroid/net/NetworkStatsHistory$Entry;)Landroid/net/NetworkStatsHistory$Entry;,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,768,5,768,25,
+Landroid/net/NetworkStatsHistory;->CREATOR:Landroid/os/Parcelable$Creator;,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,995,5,995,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 d712674..8c04033 100644
--- a/current/snapshot-creation-build-number.txt
+++ b/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-8627772
\ No newline at end of file
+8669835
\ No newline at end of file