Snap for 10276566 from 4db2ca161dc819fa486b01be36f59edc432a6b5f to tm-platform-releaseandroid-platform-13.0.0_r9android-platform-13.0.0_r8android-platform-13.0.0_r19android-platform-13.0.0_r18android-platform-13.0.0_r17android-platform-13.0.0_r16android-platform-13.0.0_r15android-platform-13.0.0_r14android-platform-13.0.0_r13android-platform-13.0.0_r12android-platform-13.0.0_r11android-platform-13.0.0_r10android13-platform-release

Change-Id: I13024c56109c9a1412a4939cec652f64be373c4e

11 files changed, 81 insertions, 68 deletions

diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index 326ecb7..6cc3d60 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: "T1005166"
+    build_id: "T1005628"
     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/compat_configs/connectivity-t-platform-compat-config/connectivity-t-platform-compat-config_meta.xml b/current/compat_configs/connectivity-t-platform-compat-config/connectivity-t-platform-compat-config_meta.xml
index 340608e..aa62e13 100644
--- a/current/compat_configs/connectivity-t-platform-compat-config/connectivity-t-platform-compat-config_meta.xml
+++ b/current/compat_configs/connectivity-t-platform-compat-config/connectivity-t-platform-compat-config_meta.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <config>
   <compat-change description="When enabled, apps targeting &lt; Android 12 are considered legacy for the NSD native daemon. The platform will only keep the daemon running as long as there are any legacy apps connected. After Android 12, direct communication with the native daemon might not work since the native daemon won't always stay alive. Using the NSD APIs from NsdManager as the replacement is recommended. Another alternative could be bundling your own mdns solutions instead of depending on the system mdns native daemon. This compatibility change applies to Android 13 and later only. To toggle behavior on Android 12 and Android 12L, use RUN_NATIVE_NSD_ONLY_IF_LEGACY_APPS." enableSinceTargetSdk="31" id="235355681" name="RUN_NATIVE_NSD_ONLY_IF_LEGACY_APPS_T_AND_LATER">
-    <meta-data definedIn="android.net.nsd.NsdManager" sourcePosition="packages/modules/Connectivity/framework-t/src/android/net/nsd/NsdManager.java:153" />
+    <meta-data definedIn="android.net.nsd.NsdManager" sourcePosition="packages/modules/Connectivity/framework-t/src/android/net/nsd/NsdManager.java:156" />
   </compat-change>
 </config>
\ No newline at end of file
diff --git a/current/hiddenapi/filtered-flags.csv b/current/hiddenapi/filtered-flags.csv
index 2c805a8..ffef987 100644
--- a/current/hiddenapi/filtered-flags.csv
+++ b/current/hiddenapi/filtered-flags.csv
@@ -1992,7 +1992,6 @@ Landroid/net/NetworkCapabilities$Builder;->setSubscriptionIds(Ljava/util/Set;)La
 Landroid/net/NetworkCapabilities$Builder;->setTransportInfo(Landroid/net/TransportInfo;)Landroid/net/NetworkCapabilities$Builder;,sdk,system-api,test-api
 Landroid/net/NetworkCapabilities$Builder;->setUnderlyingNetworks(Ljava/util/List;)Landroid/net/NetworkCapabilities$Builder;,sdk,system-api,test-api
 Landroid/net/NetworkCapabilities$Builder;->withoutDefaultCapabilities()Landroid/net/NetworkCapabilities$Builder;,sdk,system-api,test-api
-Landroid/net/NetworkCapabilities$NameOf;->nameOf(I)Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/NetworkCapabilities;-><init>()V,public-api,sdk,system-api,test-api
 Landroid/net/NetworkCapabilities;-><init>(Landroid/net/NetworkCapabilities;)V,public-api,sdk,system-api,test-api
 Landroid/net/NetworkCapabilities;->CREATOR:Landroid/os/Parcelable$Creator;,public-api,sdk,system-api,test-api
@@ -2056,7 +2055,6 @@ Landroid/net/NetworkCapabilities;->TRANSPORT_USB:I,public-api,sdk,system-api,tes
 Landroid/net/NetworkCapabilities;->TRANSPORT_VPN:I,public-api,sdk,system-api,test-api
 Landroid/net/NetworkCapabilities;->TRANSPORT_WIFI:I,public-api,sdk,system-api,test-api
 Landroid/net/NetworkCapabilities;->TRANSPORT_WIFI_AWARE:I,public-api,sdk,system-api,test-api
-Landroid/net/NetworkCapabilities;->appendStringRepresentationOfBitMaskToStringBuilder(Ljava/lang/StringBuilder;JLandroid/net/NetworkCapabilities$NameOf;Ljava/lang/String;)V,lo-prio,max-target-o
 Landroid/net/NetworkCapabilities;->appliesToUid(I)Z,lo-prio,max-target-o
 Landroid/net/NetworkCapabilities;->appliesToUidRange(Landroid/net/UidRange;)Z,lo-prio,max-target-o
 Landroid/net/NetworkCapabilities;->capabilityNameOf(I)Ljava/lang/String;,lo-prio,max-target-o
@@ -3186,12 +3184,6 @@ Landroid/net/connectivity/android/net/nsd/INsdServiceConnector$Stub$Proxy;->asBi
 Landroid/net/connectivity/android/net/nsd/INsdServiceConnector$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/android/net/nsd/INsdServiceConnector$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/android/net/util/DnsUtils$Rfc6724Comparator;->compare(Ljava/lang/Object;Ljava/lang/Object;)I,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/android/net/util/MultinetworkPolicyTracker$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/android/net/util/MultinetworkPolicyTracker$1;->onReceive(Landroid/content/Context;Landroid/content/Intent;)V,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/android/net/util/MultinetworkPolicyTracker$ActiveDataSubscriptionIdListener;->onActiveDataSubscriptionIdChanged(I)V,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/android/net/util/MultinetworkPolicyTracker$HandlerExecutor;->execute(Ljava/lang/Runnable;)V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/android/net/util/MultinetworkPolicyTracker$SettingObserver;->onChange(Z)V,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/android/net/util/MultinetworkPolicyTracker$SettingObserver;->onChange(ZLandroid/net/Uri;)V,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/android/util/IndentingPrintWriter;->println()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/android/util/IndentingPrintWriter;->write(I)V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/android/util/IndentingPrintWriter;->write(Ljava/lang/String;II)V,core-platform-api,public-api,sdk,system-api,test-api
@@ -3201,6 +3193,15 @@ Landroid/net/connectivity/com/android/net/module/util/BestClock;->getZone()Ljava
 Landroid/net/connectivity/com/android/net/module/util/BestClock;->instant()Ljava/time/Instant;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/com/android/net/module/util/BestClock;->millis()J,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/com/android/net/module/util/BestClock;->withZone(Ljava/time/ZoneId;)Ljava/time/Clock;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/com/android/net/module/util/DnsPacket$DnsHeader;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/com/android/net/module/util/DnsPacket$DnsHeader;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/com/android/net/module/util/DnsPacket$DnsHeader;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/com/android/net/module/util/DnsPacket$DnsRecord;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/com/android/net/module/util/DnsPacket$DnsRecord;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/com/android/net/module/util/DnsPacket$DnsRecord;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/com/android/net/module/util/DnsPacket;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/com/android/net/module/util/DnsPacket;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/com/android/net/module/util/DnsPacket;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/com/android/net/module/util/DnsSdTxtRecord$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/com/android/net/module/util/DnsSdTxtRecord$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/com/android/net/module/util/DnsSdTxtRecord;->describeContents()I,public-api,sdk,system-api,test-api
@@ -3276,6 +3277,12 @@ Landroid/net/nsd/NsdManager$ResolveListener;->onServiceResolved(Landroid/net/nsd
 Landroid/net/nsd/NsdManager$ServiceHandler$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/nsd/NsdManager$ServiceHandler$$ExternalSyntheticLambda10;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/nsd/NsdManager$ServiceHandler$$ExternalSyntheticLambda11;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/nsd/NsdManager$ServiceHandler$$ExternalSyntheticLambda12;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/nsd/NsdManager$ServiceHandler$$ExternalSyntheticLambda13;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/nsd/NsdManager$ServiceHandler$$ExternalSyntheticLambda14;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/nsd/NsdManager$ServiceHandler$$ExternalSyntheticLambda15;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/nsd/NsdManager$ServiceHandler$$ExternalSyntheticLambda16;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/nsd/NsdManager$ServiceHandler$$ExternalSyntheticLambda17;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/nsd/NsdManager$ServiceHandler$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/nsd/NsdManager$ServiceHandler$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/nsd/NsdManager$ServiceHandler$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,sdk,system-api,test-api
@@ -3354,7 +3361,6 @@ Landroid/net/nsd/NsdServiceInfo;->getServiceName()Ljava/lang/String;,public-api,
 Landroid/net/nsd/NsdServiceInfo;->getServiceType()Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/net/nsd/NsdServiceInfo;->getTxtRecord()[B,lo-prio,max-target-o
 Landroid/net/nsd/NsdServiceInfo;->getTxtRecordSize()I,lo-prio,max-target-o
-Landroid/net/nsd/NsdServiceInfo;->mHost:Ljava/net/InetAddress;,lo-prio,max-target-o
 Landroid/net/nsd/NsdServiceInfo;->mPort:I,lo-prio,max-target-o
 Landroid/net/nsd/NsdServiceInfo;->mServiceName:Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/nsd/NsdServiceInfo;->mServiceType:Ljava/lang/String;,lo-prio,max-target-o
diff --git a/current/hiddenapi/filtered-stub-flags.csv b/current/hiddenapi/filtered-stub-flags.csv
index ca7bf01..594d139 100644
--- a/current/hiddenapi/filtered-stub-flags.csv
+++ b/current/hiddenapi/filtered-stub-flags.csv
@@ -1922,12 +1922,6 @@ Landroid/net/connectivity/android/net/nsd/INsdServiceConnector$Stub$Proxy;->asBi
 Landroid/net/connectivity/android/net/nsd/INsdServiceConnector$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/connectivity/android/net/nsd/INsdServiceConnector$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
 Landroid/net/connectivity/android/net/util/DnsUtils$Rfc6724Comparator;->compare(Ljava/lang/Object;Ljava/lang/Object;)I,core-platform-api,public-api,system-api,test-api
-Landroid/net/connectivity/android/net/util/MultinetworkPolicyTracker$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/net/connectivity/android/net/util/MultinetworkPolicyTracker$1;->onReceive(Landroid/content/Context;Landroid/content/Intent;)V,public-api,system-api,test-api
-Landroid/net/connectivity/android/net/util/MultinetworkPolicyTracker$ActiveDataSubscriptionIdListener;->onActiveDataSubscriptionIdChanged(I)V,public-api,system-api,test-api
-Landroid/net/connectivity/android/net/util/MultinetworkPolicyTracker$HandlerExecutor;->execute(Ljava/lang/Runnable;)V,core-platform-api,public-api,system-api,test-api
-Landroid/net/connectivity/android/net/util/MultinetworkPolicyTracker$SettingObserver;->onChange(Z)V,public-api,system-api,test-api
-Landroid/net/connectivity/android/net/util/MultinetworkPolicyTracker$SettingObserver;->onChange(ZLandroid/net/Uri;)V,public-api,system-api,test-api
 Landroid/net/connectivity/android/util/IndentingPrintWriter;->println()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/android/util/IndentingPrintWriter;->write(I)V,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/android/util/IndentingPrintWriter;->write(Ljava/lang/String;II)V,core-platform-api,public-api,system-api,test-api
@@ -1937,6 +1931,15 @@ Landroid/net/connectivity/com/android/net/module/util/BestClock;->getZone()Ljava
 Landroid/net/connectivity/com/android/net/module/util/BestClock;->instant()Ljava/time/Instant;,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/com/android/net/module/util/BestClock;->millis()J,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/com/android/net/module/util/BestClock;->withZone(Ljava/time/ZoneId;)Ljava/time/Clock;,core-platform-api,public-api,system-api,test-api
+Landroid/net/connectivity/com/android/net/module/util/DnsPacket$DnsHeader;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/connectivity/com/android/net/module/util/DnsPacket$DnsHeader;->hashCode()I,core-platform-api,public-api,system-api,test-api
+Landroid/net/connectivity/com/android/net/module/util/DnsPacket$DnsHeader;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
+Landroid/net/connectivity/com/android/net/module/util/DnsPacket$DnsRecord;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/connectivity/com/android/net/module/util/DnsPacket$DnsRecord;->hashCode()I,core-platform-api,public-api,system-api,test-api
+Landroid/net/connectivity/com/android/net/module/util/DnsPacket$DnsRecord;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
+Landroid/net/connectivity/com/android/net/module/util/DnsPacket;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/connectivity/com/android/net/module/util/DnsPacket;->hashCode()I,core-platform-api,public-api,system-api,test-api
+Landroid/net/connectivity/com/android/net/module/util/DnsPacket;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/com/android/net/module/util/DnsSdTxtRecord$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/net/connectivity/com/android/net/module/util/DnsSdTxtRecord$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/net/connectivity/com/android/net/module/util/DnsSdTxtRecord;->describeContents()I,public-api,system-api,test-api
@@ -2006,6 +2009,12 @@ Landroid/net/nsd/NsdManager$ResolveListener;->onServiceResolved(Landroid/net/nsd
 Landroid/net/nsd/NsdManager$ServiceHandler$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/nsd/NsdManager$ServiceHandler$$ExternalSyntheticLambda10;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/nsd/NsdManager$ServiceHandler$$ExternalSyntheticLambda11;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/net/nsd/NsdManager$ServiceHandler$$ExternalSyntheticLambda12;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/net/nsd/NsdManager$ServiceHandler$$ExternalSyntheticLambda13;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/net/nsd/NsdManager$ServiceHandler$$ExternalSyntheticLambda14;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/net/nsd/NsdManager$ServiceHandler$$ExternalSyntheticLambda15;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/net/nsd/NsdManager$ServiceHandler$$ExternalSyntheticLambda16;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/net/nsd/NsdManager$ServiceHandler$$ExternalSyntheticLambda17;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/nsd/NsdManager$ServiceHandler$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/nsd/NsdManager$ServiceHandler$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/nsd/NsdManager$ServiceHandler$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,system-api,test-api
diff --git a/current/hiddenapi/index.csv b/current/hiddenapi/index.csv
index 299bde6..de7ff02 100644
--- a/current/hiddenapi/index.csv
+++ b/current/hiddenapi/index.csv
@@ -1,10 +1,10 @@
 signature,file,startline,startcol,endline,endcol,properties
 Landroid/app/usage/NetworkStatsManager;->setPollForce(Z)V,packages/modules/Connectivity/framework-t/src/android/app/usage/NetworkStatsManager.java,203,5,203,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager$PacketKeepalive;->stop()V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2209,9,2209,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager$PacketKeepaliveCallback;-><init>()V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2135,9,2135,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager$PacketKeepaliveCallback;->onStarted()V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2139,9,2139,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager$PacketKeepaliveCallback;->onStopped()V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2142,9,2142,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager$PacketKeepaliveCallback;->onError(I)V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2145,9,2145,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager$PacketKeepalive;->stop()V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2211,9,2211,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager$PacketKeepaliveCallback;-><init>()V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2137,9,2137,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager$PacketKeepaliveCallback;->onStarted()V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2141,9,2141,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager$PacketKeepaliveCallback;->onStopped()V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2144,9,2144,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager$PacketKeepaliveCallback;->onError(I)V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2147,9,2147,92,maxTargetSdk=30&trackingBug=170729553L
 Landroid/net/ConnectivityManager;->INET_CONDITION_ACTION:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,356,5,356,25,
 Landroid/net/ConnectivityManager;->ACTION_TETHER_STATE_CHANGED:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,371,5,371,88,maxTargetSdk=30&trackingBug=170729553L
 Landroid/net/ConnectivityManager;->EXTRA_AVAILABLE_TETHER:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,380,5,380,88,maxTargetSdk=30&trackingBug=170729553L
@@ -17,34 +17,34 @@ Landroid/net/ConnectivityManager;->TYPE_MOBILE_IA:I,packages/modules/Connectivit
 Landroid/net/ConnectivityManager;->TYPE_MOBILE_EMERGENCY:I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,715,5,715,88,maxTargetSdk=28&trackingBug=130143562L
 Landroid/net/ConnectivityManager;->mService:Landroid/net/IConnectivityManager;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,941,5,941,88,maxTargetSdk=28&trackingBug=130143562L
 Landroid/net/ConnectivityManager;->getNetworkTypeName(I)Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1129,5,1129,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->isNetworkTypeMobile(I)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1196,5,1196,88,maxTargetSdk=28&trackingBug=130143562L
-Landroid/net/ConnectivityManager;->getActiveNetworkInfoForUid(I)Landroid/net/NetworkInfo;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1479,5,1479,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->getNetworkForType(I)Landroid/net/Network;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1598,5,1598,25,
-Landroid/net/ConnectivityManager;->getDefaultNetworkCapabilitiesForUser(I)[Landroid/net/NetworkCapabilities;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1635,5,1635,25,
-Landroid/net/ConnectivityManager;->getActiveLinkProperties()Landroid/net/LinkProperties;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1659,5,1659,88,maxTargetSdk=28&trackingBug=109783091L
-Landroid/net/ConnectivityManager;->getLinkProperties(I)Landroid/net/LinkProperties;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1684,5,1684,88,maxTargetSdk=28&trackingBug=130143562L
-Landroid/net/ConnectivityManager;->networkCapabilitiesForFeature(ILjava/lang/String;)Landroid/net/NetworkCapabilities;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1921,5,1921,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->sLegacyRequests:Ljava/util/HashMap;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2007,5,2007,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->requestNetworkForFeatureLocked(Landroid/net/NetworkCapabilities;)Landroid/net/NetworkRequest;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2036,5,2036,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->removeRequestForFeature(Landroid/net/NetworkCapabilities;)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2066,5,2066,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->startNattKeepalive(Landroid/net/Network;ILandroid/net/ConnectivityManager$PacketKeepaliveCallback;Ljava/net/InetAddress;ILjava/net/InetAddress;)Landroid/net/ConnectivityManager$PacketKeepalive;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2290,5,2290,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->requestRouteToHostAddress(ILjava/net/InetAddress;)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2470,5,2470,25,
-Landroid/net/ConnectivityManager;->setBackgroundDataSetting(Z)V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2524,5,2524,25,
-Landroid/net/ConnectivityManager;->getMobileDataEnabled()Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2534,5,2534,25,
-Landroid/net/ConnectivityManager;->from(Landroid/content/Context;)Landroid/net/ConnectivityManager;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2661,5,2661,25,
-Landroid/net/ConnectivityManager;->getInstance()Landroid/net/ConnectivityManager;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2706,5,2706,25,
-Landroid/net/ConnectivityManager;->getTetherableIfaces()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2724,5,2724,25,
-Landroid/net/ConnectivityManager;->getTetheredIfaces()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2739,5,2739,25,
-Landroid/net/ConnectivityManager;->getTetheringErroredIfaces()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2760,5,2760,25,
-Landroid/net/ConnectivityManager;->tether(Ljava/lang/String;)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2804,5,2804,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->untether(Ljava/lang/String;)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2828,5,2828,25,
-Landroid/net/ConnectivityManager;->getTetherableUsbRegexs()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3066,5,3066,25,
-Landroid/net/ConnectivityManager;->getTetherableWifiRegexs()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3084,5,3084,25,
-Landroid/net/ConnectivityManager;->getTetherableBluetoothRegexs()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3103,5,3103,25,
-Landroid/net/ConnectivityManager;->setUsbTethering(Z)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3127,5,3127,25,
-Landroid/net/ConnectivityManager;->getLastTetherError(Ljava/lang/String;)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3243,5,3243,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->isNetworkSupported(I)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3492,5,3492,88,maxTargetSdk=28&trackingBug=130143562L
-Landroid/net/ConnectivityManager;->setProcessDefaultNetworkForHostResolution(Landroid/net/Network;)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,5285,5,5285,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->isNetworkTypeMobile(I)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1198,5,1198,88,maxTargetSdk=28&trackingBug=130143562L
+Landroid/net/ConnectivityManager;->getActiveNetworkInfoForUid(I)Landroid/net/NetworkInfo;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1481,5,1481,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->getNetworkForType(I)Landroid/net/Network;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1600,5,1600,25,
+Landroid/net/ConnectivityManager;->getDefaultNetworkCapabilitiesForUser(I)[Landroid/net/NetworkCapabilities;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1637,5,1637,25,
+Landroid/net/ConnectivityManager;->getActiveLinkProperties()Landroid/net/LinkProperties;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1661,5,1661,88,maxTargetSdk=28&trackingBug=109783091L
+Landroid/net/ConnectivityManager;->getLinkProperties(I)Landroid/net/LinkProperties;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1686,5,1686,88,maxTargetSdk=28&trackingBug=130143562L
+Landroid/net/ConnectivityManager;->networkCapabilitiesForFeature(ILjava/lang/String;)Landroid/net/NetworkCapabilities;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1923,5,1923,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->sLegacyRequests:Ljava/util/HashMap;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2009,5,2009,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->requestNetworkForFeatureLocked(Landroid/net/NetworkCapabilities;)Landroid/net/NetworkRequest;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2038,5,2038,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->removeRequestForFeature(Landroid/net/NetworkCapabilities;)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2068,5,2068,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->startNattKeepalive(Landroid/net/Network;ILandroid/net/ConnectivityManager$PacketKeepaliveCallback;Ljava/net/InetAddress;ILjava/net/InetAddress;)Landroid/net/ConnectivityManager$PacketKeepalive;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2292,5,2292,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->requestRouteToHostAddress(ILjava/net/InetAddress;)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2472,5,2472,25,
+Landroid/net/ConnectivityManager;->setBackgroundDataSetting(Z)V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2526,5,2526,25,
+Landroid/net/ConnectivityManager;->getMobileDataEnabled()Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2536,5,2536,25,
+Landroid/net/ConnectivityManager;->from(Landroid/content/Context;)Landroid/net/ConnectivityManager;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2663,5,2663,25,
+Landroid/net/ConnectivityManager;->getInstance()Landroid/net/ConnectivityManager;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2708,5,2708,25,
+Landroid/net/ConnectivityManager;->getTetherableIfaces()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2726,5,2726,25,
+Landroid/net/ConnectivityManager;->getTetheredIfaces()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2741,5,2741,25,
+Landroid/net/ConnectivityManager;->getTetheringErroredIfaces()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2762,5,2762,25,
+Landroid/net/ConnectivityManager;->tether(Ljava/lang/String;)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2806,5,2806,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->untether(Ljava/lang/String;)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2830,5,2830,25,
+Landroid/net/ConnectivityManager;->getTetherableUsbRegexs()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3068,5,3068,25,
+Landroid/net/ConnectivityManager;->getTetherableWifiRegexs()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3086,5,3086,25,
+Landroid/net/ConnectivityManager;->getTetherableBluetoothRegexs()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3105,5,3105,25,
+Landroid/net/ConnectivityManager;->setUsbTethering(Z)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3129,5,3129,25,
+Landroid/net/ConnectivityManager;->getLastTetherError(Ljava/lang/String;)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3245,5,3245,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->isNetworkSupported(I)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3494,5,3494,88,maxTargetSdk=28&trackingBug=130143562L
+Landroid/net/ConnectivityManager;->setProcessDefaultNetworkForHostResolution(Landroid/net/Network;)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,5290,5,5290,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,165,9,165,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,192,5,192,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,205,5,205,88,maxTargetSdk=30&trackingBug=170729553L
@@ -104,10 +104,10 @@ Landroid/net/MacAddress;->ALL_ZEROS_ADDRESS:Landroid/net/MacAddress;,packages/mo
 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
 Landroid/net/NetworkAgent;->sendNetworkInfo(Landroid/net/NetworkInfo;)V,packages/modules/Connectivity/framework/src/android/net/NetworkAgent.java,1077,5,1077,88,maxTargetSdk=28&trackingBug=115609023L
-Landroid/net/NetworkCapabilities;->mNetworkCapabilities:J,packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java,322,5,322,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/NetworkCapabilities;->mSignalStrength:I,packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java,1619,5,1619,63,maxTargetSdk=28
-Landroid/net/NetworkCapabilities;->hasSignalStrength()Z,packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java,1645,5,1645,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/NetworkCapabilities;->transportNamesOf([I)Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java,2382,5,2382,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkCapabilities;->mNetworkCapabilities:J,packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java,332,5,332,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkCapabilities;->mSignalStrength:I,packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java,1647,5,1647,63,maxTargetSdk=28
+Landroid/net/NetworkCapabilities;->hasSignalStrength()Z,packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java,1673,5,1673,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkCapabilities;->transportNamesOf([I)Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java,2414,5,2414,88,maxTargetSdk=30&trackingBug=170729553L
 Landroid/net/NetworkInfo;-><init>(Landroid/net/NetworkInfo;)V,packages/modules/Connectivity/framework/src/android/net/NetworkInfo.java,182,5,182,25,
 Landroid/net/NetworkInfo;->setSubtype(ILjava/lang/String;)V,packages/modules/Connectivity/framework/src/android/net/NetworkInfo.java,253,5,253,25,
 Landroid/net/NetworkInfo;->setIsAvailable(Z)V,packages/modules/Connectivity/framework/src/android/net/NetworkInfo.java,372,5,372,25,
@@ -168,16 +168,16 @@ Landroid/net/NetworkStatsHistory;->recordEntireHistory(Landroid/net/NetworkStats
 Landroid/net/NetworkStatsHistory;->getValues(JJLandroid/net/NetworkStatsHistory$Entry;)Landroid/net/NetworkStatsHistory$Entry;,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,758,5,758,25,
 Landroid/net/NetworkStatsHistory;->getValues(JJJLandroid/net/NetworkStatsHistory$Entry;)Landroid/net/NetworkStatsHistory$Entry;,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,773,5,773,25,
 Landroid/net/NetworkStatsHistory;->CREATOR:Landroid/os/Parcelable$Creator;,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,1001,5,1001,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,
-Landroid/net/NetworkTemplate;->buildTemplateWifi()Landroid/net/NetworkTemplate;,packages/modules/Connectivity/framework-t/src/android/net/NetworkTemplate.java,245,5,245,25,
-Landroid/net/NetworkTemplate;->buildTemplateEthernet()Landroid/net/NetworkTemplate;,packages/modules/Connectivity/framework-t/src/android/net/NetworkTemplate.java,295,5,295,25,
-Landroid/net/NetworkTemplate;-><init>(ILjava/lang/String;Ljava/lang/String;)V,packages/modules/Connectivity/framework-t/src/android/net/NetworkTemplate.java,382,5,382,25,
-Landroid/net/NetworkTemplate;->getMatchRule()I,packages/modules/Connectivity/framework-t/src/android/net/NetworkTemplate.java,551,5,551,25,
-Landroid/net/NetworkTemplate;->getSubscriberId()Ljava/lang/String;,packages/modules/Connectivity/framework-t/src/android/net/NetworkTemplate.java,570,5,570,25,
-Landroid/net/NetworkTemplate;->normalize(Landroid/net/NetworkTemplate;[Ljava/lang/String;)Landroid/net/NetworkTemplate;,packages/modules/Connectivity/framework-t/src/android/net/NetworkTemplate.java,863,5,863,25,
-Landroid/net/NetworkTemplate;->CREATOR:Landroid/os/Parcelable$Creator;,packages/modules/Connectivity/framework-t/src/android/net/NetworkTemplate.java,906,5,906,25,
+Landroid/net/NetworkTemplate;->buildTemplateMobileAll(Ljava/lang/String;)Landroid/net/NetworkTemplate;,packages/modules/Connectivity/framework-t/src/android/net/NetworkTemplate.java,202,5,202,25,
+Landroid/net/NetworkTemplate;->buildTemplateMobileWildcard()Landroid/net/NetworkTemplate;,packages/modules/Connectivity/framework-t/src/android/net/NetworkTemplate.java,235,5,235,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkTemplate;->buildTemplateWifiWildcard()Landroid/net/NetworkTemplate;,packages/modules/Connectivity/framework-t/src/android/net/NetworkTemplate.java,246,5,246,25,
+Landroid/net/NetworkTemplate;->buildTemplateWifi()Landroid/net/NetworkTemplate;,packages/modules/Connectivity/framework-t/src/android/net/NetworkTemplate.java,255,5,255,25,
+Landroid/net/NetworkTemplate;->buildTemplateEthernet()Landroid/net/NetworkTemplate;,packages/modules/Connectivity/framework-t/src/android/net/NetworkTemplate.java,305,5,305,25,
+Landroid/net/NetworkTemplate;-><init>(ILjava/lang/String;Ljava/lang/String;)V,packages/modules/Connectivity/framework-t/src/android/net/NetworkTemplate.java,392,5,392,25,
+Landroid/net/NetworkTemplate;->getMatchRule()I,packages/modules/Connectivity/framework-t/src/android/net/NetworkTemplate.java,561,5,561,25,
+Landroid/net/NetworkTemplate;->getSubscriberId()Ljava/lang/String;,packages/modules/Connectivity/framework-t/src/android/net/NetworkTemplate.java,580,5,580,25,
+Landroid/net/NetworkTemplate;->normalize(Landroid/net/NetworkTemplate;[Ljava/lang/String;)Landroid/net/NetworkTemplate;,packages/modules/Connectivity/framework-t/src/android/net/NetworkTemplate.java,888,5,888,25,
+Landroid/net/NetworkTemplate;->CREATOR:Landroid/os/Parcelable$Creator;,packages/modules/Connectivity/framework-t/src/android/net/NetworkTemplate.java,931,5,931,25,
 Landroid/net/NetworkUtils;->intToInetAddress(I)Ljava/net/InetAddress;,packages/modules/Connectivity/framework/src/android/net/NetworkUtils.java,183,5,183,25,
 Landroid/net/NetworkUtils;->prefixLengthToNetmaskInt(I)I,packages/modules/Connectivity/framework/src/android/net/NetworkUtils.java,205,5,205,25,
 Landroid/net/NetworkUtils;->netmaskToPrefixLength(Ljava/net/Inet4Address;)I,packages/modules/Connectivity/framework/src/android/net/NetworkUtils.java,228,5,228,88,maxTargetSdk=30&trackingBug=170729553L
@@ -201,7 +201,7 @@ Landroid/net/TrafficStats;->getStatsService()Landroid/net/INetworkStatsService;,
 Landroid/net/TrafficStats;->getMobileTcpRxPackets()J,packages/modules/Connectivity/framework-t/src/android/net/TrafficStats.java,684,5,684,88,maxTargetSdk=30&trackingBug=170729553L
 Landroid/net/TrafficStats;->getMobileTcpTxPackets()J,packages/modules/Connectivity/framework-t/src/android/net/TrafficStats.java,700,5,700,88,maxTargetSdk=30&trackingBug=170729553L
 Landroid/net/TrafficStats;->getMobileIfaces()[Ljava/lang/String;,packages/modules/Connectivity/framework-t/src/android/net/TrafficStats.java,1126,5,1126,88,maxTargetSdk=28&trackingBug=130143562L
-Landroid/net/nsd/NsdServiceInfo;->setAttribute(Ljava/lang/String;[B)V,packages/modules/Connectivity/framework-t/src/android/net/nsd/NsdServiceInfo.java,193,5,193,25,
+Landroid/net/nsd/NsdServiceInfo;->setAttribute(Ljava/lang/String;[B)V,packages/modules/Connectivity/framework-t/src/android/net/nsd/NsdServiceInfo.java,232,5,232,25,
 Lcom/android/internal/util/Preconditions;->checkArgument(Z)V,frameworks/libs/modules-utils/java/com/android/internal/util/Preconditions.java,41,5,41,25,
 Lcom/android/internal/util/Preconditions;->checkArgument(ZLjava/lang/Object;)V,frameworks/libs/modules-utils/java/com/android/internal/util/Preconditions.java,56,5,56,88,maxTargetSdk=30&trackingBug=170729553L
 Lcom/android/internal/util/Preconditions;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;,frameworks/libs/modules-utils/java/com/android/internal/util/Preconditions.java,144,5,144,25,
diff --git a/current/sdk_library/module-lib/framework-connectivity-stubs.jar b/current/sdk_library/module-lib/framework-connectivity-stubs.jar
index 25c5442..42c7e9d 100644
--- a/current/sdk_library/module-lib/framework-connectivity-stubs.jar
+++ b/current/sdk_library/module-lib/framework-connectivity-stubs.jar
diff --git a/current/sdk_library/module-lib/framework-connectivity.srcjar b/current/sdk_library/module-lib/framework-connectivity.srcjar
index 132d391..129ab2f 100644
--- a/current/sdk_library/module-lib/framework-connectivity.srcjar
+++ b/current/sdk_library/module-lib/framework-connectivity.srcjar
diff --git a/current/sdk_library/module-lib/framework-connectivity.txt b/current/sdk_library/module-lib/framework-connectivity.txt
index a2a1ac0..4ce6add 100644
--- a/current/sdk_library/module-lib/framework-connectivity.txt
+++ b/current/sdk_library/module-lib/framework-connectivity.txt
@@ -200,8 +200,6 @@ package android.net {
     method public int describeContents();
     method @NonNull public android.os.ParcelFileDescriptor getFileDescriptor();
     method @NonNull public String getInterfaceName();
-    method @Nullable public android.net.MacAddress getMacAddress();
-    method public int getMtu();
     method public void writeToParcel(@NonNull android.os.Parcel, int);
     field @NonNull public static final android.os.Parcelable.Creator<android.net.TestNetworkInterface> CREATOR;
   }
diff --git a/current/sdk_library/public/framework-connectivity-t-stubs.jar b/current/sdk_library/public/framework-connectivity-t-stubs.jar
index 205cbc7..120c407 100644
--- a/current/sdk_library/public/framework-connectivity-t-stubs.jar
+++ b/current/sdk_library/public/framework-connectivity-t-stubs.jar
diff --git a/current/sdk_library/public/framework-connectivity-t.srcjar b/current/sdk_library/public/framework-connectivity-t.srcjar
index b53beee..4cb6bd8 100644
--- a/current/sdk_library/public/framework-connectivity-t.srcjar
+++ b/current/sdk_library/public/framework-connectivity-t.srcjar
diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt
index d37461b..5fec41f 100644
--- a/current/snapshot-creation-build-number.txt
+++ b/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-9279843
\ No newline at end of file
+9783802
\ No newline at end of file