Merge "Drop prebuilt files to android source tree." into main

22 files changed, 132 insertions, 51 deletions

diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index 5a71875..1ba82c5 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: "11003728"
+    build_id: "P65040987"
     target: "mainline_modules_sdks-trunk-userdebug"
     source_file: "mainline-sdks/for-latest-build/current/com.google.android.tethering/sdk/tethering-module-sdk-current.zip"
   }
diff --git a/current/Android.bp b/current/Android.bp
index b70e8fe..8583316 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -207,6 +207,43 @@ license {
 }
 
 cc_prebuilt_library_shared {
+    name: "libcom.android.tethering.dns_helper",
+    // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
+    use_source_config_var: {
+        config_namespace: "ANDROID",
+        var_name: "module_build_from_source",
+    },
+    visibility: ["//visibility:public"],
+    apex_available: ["com.android.tethering"],
+    licenses: ["tethering-module-sdk_Android-Apache-2.0"],
+    compile_multilib: "both",
+    export_include_dirs: ["include/packages/modules/Connectivity/DnsResolver/include"],
+    sanitize: {
+        cfi: true,
+    },
+    stubs: {
+        versions: [
+            "1",
+            "current",
+        ],
+    },
+    arch: {
+        arm64: {
+            srcs: ["arm64/lib/libcom.android.tethering.dns_helper.so"],
+        },
+        x86_64: {
+            srcs: ["x86_64/lib/libcom.android.tethering.dns_helper.so"],
+        },
+        arm: {
+            srcs: ["arm/lib/libcom.android.tethering.dns_helper.so"],
+        },
+        x86: {
+            srcs: ["x86/lib/libcom.android.tethering.dns_helper.so"],
+        },
+    },
+}
+
+cc_prebuilt_library_shared {
     name: "libnetd_updatable",
     // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
     use_source_config_var: {
diff --git a/current/arm/lib/libcom.android.tethering.dns_helper.so b/current/arm/lib/libcom.android.tethering.dns_helper.so
new file mode 100755
index 0000000..69a3750
--- /dev/null
+++ b/current/arm/lib/libcom.android.tethering.dns_helper.so
diff --git a/current/arm64/lib/libcom.android.tethering.dns_helper.so b/current/arm64/lib/libcom.android.tethering.dns_helper.so
new file mode 100755
index 0000000..45492ab
--- /dev/null
+++ b/current/arm64/lib/libcom.android.tethering.dns_helper.so
diff --git a/current/hiddenapi/filtered-flags.csv b/current/hiddenapi/filtered-flags.csv
index d21db5d..f03444a 100644
--- a/current/hiddenapi/filtered-flags.csv
+++ b/current/hiddenapi/filtered-flags.csv
@@ -476,6 +476,7 @@ Landroid/net/ConnectivityManager$CallbackHandler;->DBG:Z,lo-prio,max-target-o
 Landroid/net/ConnectivityManager$CallbackHandler;->TAG:Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/ConnectivityManager$CallbackHandler;->getObject(Landroid/os/Message;Ljava/lang/Class;)Ljava/lang/Object;,lo-prio,max-target-o
 Landroid/net/ConnectivityManager$CallbackHandler;->handleMessage(Landroid/os/Message;)V,public-api,sdk,system-api,test-api
+Landroid/net/ConnectivityManager$DataSaverStatusTracker;->onReceive(Landroid/content/Context;Landroid/content/Intent;)V,public-api,sdk,system-api,test-api
 Landroid/net/ConnectivityManager$Errors;->TOO_MANY_REQUESTS:I,lo-prio,max-target-o
 Landroid/net/ConnectivityManager$LegacyRequest$1;->onAvailable(Landroid/net/Network;)V,public-api,sdk,system-api,test-api
 Landroid/net/ConnectivityManager$LegacyRequest$1;->onLost(Landroid/net/Network;)V,public-api,sdk,system-api,test-api
@@ -3171,7 +3172,6 @@ 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/BpfMap;->close()V,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
diff --git a/current/hiddenapi/filtered-stub-flags.csv b/current/hiddenapi/filtered-stub-flags.csv
index 0119e98..4fc789b 100644
--- a/current/hiddenapi/filtered-stub-flags.csv
+++ b/current/hiddenapi/filtered-stub-flags.csv
@@ -405,6 +405,7 @@ Landroid/net/ConnectivityManager$5$$ExternalSyntheticLambda0;->run()V,core-platf
 Landroid/net/ConnectivityManager$5;->onReceiveResult(ILandroid/os/Bundle;)V,public-api,system-api,test-api
 Landroid/net/ConnectivityManager$6$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/ConnectivityManager$CallbackHandler;->handleMessage(Landroid/os/Message;)V,public-api,system-api,test-api
+Landroid/net/ConnectivityManager$DataSaverStatusTracker;->onReceive(Landroid/content/Context;Landroid/content/Intent;)V,public-api,system-api,test-api
 Landroid/net/ConnectivityManager$LegacyRequest$1;->onAvailable(Landroid/net/Network;)V,public-api,system-api,test-api
 Landroid/net/ConnectivityManager$LegacyRequest$1;->onLost(Landroid/net/Network;)V,public-api,system-api,test-api
 Landroid/net/ConnectivityManager$NetworkCallback;-><init>()V,public-api,system-api,test-api
@@ -1920,7 +1921,6 @@ 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/BpfMap;->close()V,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
diff --git a/current/hiddenapi/index.csv b/current/hiddenapi/index.csv
index e6d6d57..a9d3eff 100644
--- a/current/hiddenapi/index.csv
+++ b/current/hiddenapi/index.csv
@@ -1,50 +1,50 @@
 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,2312,9,2312,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager$PacketKeepaliveCallback;-><init>()V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2236,9,2236,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager$PacketKeepaliveCallback;->onStarted()V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2240,9,2240,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager$PacketKeepaliveCallback;->onStopped()V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2245,9,2245,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager$PacketKeepaliveCallback;->onError(I)V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2250,9,2250,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->INET_CONDITION_ACTION:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,366,5,366,25,
-Landroid/net/ConnectivityManager;->ACTION_TETHER_STATE_CHANGED:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,381,5,381,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->EXTRA_AVAILABLE_TETHER:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,390,5,390,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->EXTRA_ACTIVE_TETHER:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,405,5,405,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->EXTRA_ERRORED_TETHER:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,414,5,414,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->TYPE_MOBILE_FOTA:I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,678,5,678,88,maxTargetSdk=28&trackingBug=130143562L
-Landroid/net/ConnectivityManager;->TYPE_MOBILE_IMS:I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,687,5,687,25,
-Landroid/net/ConnectivityManager;->TYPE_MOBILE_CBS:I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,696,5,696,88,maxTargetSdk=28&trackingBug=130143562L
-Landroid/net/ConnectivityManager;->TYPE_MOBILE_IA:I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,715,5,715,25,
-Landroid/net/ConnectivityManager;->TYPE_MOBILE_EMERGENCY:I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,725,5,725,88,maxTargetSdk=28&trackingBug=130143562L
-Landroid/net/ConnectivityManager;->mService:Landroid/net/IConnectivityManager;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,951,5,951,88,maxTargetSdk=28&trackingBug=130143562L
-Landroid/net/ConnectivityManager;->getNetworkTypeName(I)Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1139,5,1139,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->isNetworkTypeMobile(I)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1208,5,1208,88,maxTargetSdk=28&trackingBug=130143562L
-Landroid/net/ConnectivityManager;->getActiveNetworkInfoForUid(I)Landroid/net/NetworkInfo;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1580,5,1580,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->getNetworkForType(I)Landroid/net/Network;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1699,5,1699,25,
-Landroid/net/ConnectivityManager;->getDefaultNetworkCapabilitiesForUser(I)[Landroid/net/NetworkCapabilities;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1736,5,1736,25,
-Landroid/net/ConnectivityManager;->getActiveLinkProperties()Landroid/net/LinkProperties;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1760,5,1760,88,maxTargetSdk=28&trackingBug=109783091L
-Landroid/net/ConnectivityManager;->getLinkProperties(I)Landroid/net/LinkProperties;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1785,5,1785,88,maxTargetSdk=28&trackingBug=130143562L
-Landroid/net/ConnectivityManager;->networkCapabilitiesForFeature(ILjava/lang/String;)Landroid/net/NetworkCapabilities;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2022,5,2022,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->sLegacyRequests:Ljava/util/HashMap;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2108,5,2108,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->requestNetworkForFeatureLocked(Landroid/net/NetworkCapabilities;)Landroid/net/NetworkRequest;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2137,5,2137,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->removeRequestForFeature(Landroid/net/NetworkCapabilities;)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2167,5,2167,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,2413,5,2413,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->requestRouteToHostAddress(ILjava/net/InetAddress;)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2613,5,2613,25,
-Landroid/net/ConnectivityManager;->setBackgroundDataSetting(Z)V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2667,5,2667,25,
-Landroid/net/ConnectivityManager;->getMobileDataEnabled()Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2677,5,2677,25,
-Landroid/net/ConnectivityManager;->from(Landroid/content/Context;)Landroid/net/ConnectivityManager;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2804,5,2804,25,
-Landroid/net/ConnectivityManager;->getInstance()Landroid/net/ConnectivityManager;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2849,5,2849,25,
-Landroid/net/ConnectivityManager;->getTetherableIfaces()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2867,5,2867,25,
-Landroid/net/ConnectivityManager;->getTetheredIfaces()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2882,5,2882,25,
-Landroid/net/ConnectivityManager;->getTetheringErroredIfaces()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2903,5,2903,25,
-Landroid/net/ConnectivityManager;->tether(Ljava/lang/String;)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2947,5,2947,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->untether(Ljava/lang/String;)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2971,5,2971,25,
-Landroid/net/ConnectivityManager;->getTetherableUsbRegexs()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3209,5,3209,25,
-Landroid/net/ConnectivityManager;->getTetherableWifiRegexs()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3227,5,3227,25,
-Landroid/net/ConnectivityManager;->getTetherableBluetoothRegexs()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3246,5,3246,25,
-Landroid/net/ConnectivityManager;->setUsbTethering(Z)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3270,5,3270,25,
-Landroid/net/ConnectivityManager;->getLastTetherError(Ljava/lang/String;)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3386,5,3386,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->isNetworkSupported(I)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3635,5,3635,88,maxTargetSdk=28&trackingBug=130143562L
-Landroid/net/ConnectivityManager;->setProcessDefaultNetworkForHostResolution(Landroid/net/Network;)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,5450,5,5450,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager$PacketKeepalive;->stop()V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2324,9,2324,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager$PacketKeepaliveCallback;-><init>()V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2248,9,2248,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager$PacketKeepaliveCallback;->onStarted()V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2252,9,2252,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager$PacketKeepaliveCallback;->onStopped()V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2257,9,2257,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager$PacketKeepaliveCallback;->onError(I)V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2262,9,2262,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->INET_CONDITION_ACTION:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,378,5,378,25,
+Landroid/net/ConnectivityManager;->ACTION_TETHER_STATE_CHANGED:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,393,5,393,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->EXTRA_AVAILABLE_TETHER:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,402,5,402,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->EXTRA_ACTIVE_TETHER:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,417,5,417,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->EXTRA_ERRORED_TETHER:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,426,5,426,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->TYPE_MOBILE_FOTA:I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,690,5,690,88,maxTargetSdk=28&trackingBug=130143562L
+Landroid/net/ConnectivityManager;->TYPE_MOBILE_IMS:I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,699,5,699,25,
+Landroid/net/ConnectivityManager;->TYPE_MOBILE_CBS:I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,708,5,708,88,maxTargetSdk=28&trackingBug=130143562L
+Landroid/net/ConnectivityManager;->TYPE_MOBILE_IA:I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,727,5,727,25,
+Landroid/net/ConnectivityManager;->TYPE_MOBILE_EMERGENCY:I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,737,5,737,88,maxTargetSdk=28&trackingBug=130143562L
+Landroid/net/ConnectivityManager;->mService:Landroid/net/IConnectivityManager;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,963,5,963,88,maxTargetSdk=28&trackingBug=130143562L
+Landroid/net/ConnectivityManager;->getNetworkTypeName(I)Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1151,5,1151,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->isNetworkTypeMobile(I)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1220,5,1220,88,maxTargetSdk=28&trackingBug=130143562L
+Landroid/net/ConnectivityManager;->getActiveNetworkInfoForUid(I)Landroid/net/NetworkInfo;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1592,5,1592,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->getNetworkForType(I)Landroid/net/Network;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1711,5,1711,25,
+Landroid/net/ConnectivityManager;->getDefaultNetworkCapabilitiesForUser(I)[Landroid/net/NetworkCapabilities;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1748,5,1748,25,
+Landroid/net/ConnectivityManager;->getActiveLinkProperties()Landroid/net/LinkProperties;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1772,5,1772,88,maxTargetSdk=28&trackingBug=109783091L
+Landroid/net/ConnectivityManager;->getLinkProperties(I)Landroid/net/LinkProperties;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1797,5,1797,88,maxTargetSdk=28&trackingBug=130143562L
+Landroid/net/ConnectivityManager;->networkCapabilitiesForFeature(ILjava/lang/String;)Landroid/net/NetworkCapabilities;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2034,5,2034,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->sLegacyRequests:Ljava/util/HashMap;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2120,5,2120,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->requestNetworkForFeatureLocked(Landroid/net/NetworkCapabilities;)Landroid/net/NetworkRequest;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2149,5,2149,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->removeRequestForFeature(Landroid/net/NetworkCapabilities;)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2179,5,2179,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,2425,5,2425,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->requestRouteToHostAddress(ILjava/net/InetAddress;)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2625,5,2625,25,
+Landroid/net/ConnectivityManager;->setBackgroundDataSetting(Z)V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2679,5,2679,25,
+Landroid/net/ConnectivityManager;->getMobileDataEnabled()Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2689,5,2689,25,
+Landroid/net/ConnectivityManager;->from(Landroid/content/Context;)Landroid/net/ConnectivityManager;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2816,5,2816,25,
+Landroid/net/ConnectivityManager;->getInstance()Landroid/net/ConnectivityManager;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2861,5,2861,25,
+Landroid/net/ConnectivityManager;->getTetherableIfaces()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2879,5,2879,25,
+Landroid/net/ConnectivityManager;->getTetheredIfaces()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2894,5,2894,25,
+Landroid/net/ConnectivityManager;->getTetheringErroredIfaces()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2915,5,2915,25,
+Landroid/net/ConnectivityManager;->tether(Ljava/lang/String;)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2959,5,2959,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->untether(Ljava/lang/String;)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2983,5,2983,25,
+Landroid/net/ConnectivityManager;->getTetherableUsbRegexs()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3221,5,3221,25,
+Landroid/net/ConnectivityManager;->getTetherableWifiRegexs()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3239,5,3239,25,
+Landroid/net/ConnectivityManager;->getTetherableBluetoothRegexs()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3258,5,3258,25,
+Landroid/net/ConnectivityManager;->setUsbTethering(Z)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3282,5,3282,25,
+Landroid/net/ConnectivityManager;->getLastTetherError(Ljava/lang/String;)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3398,5,3398,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->isNetworkSupported(I)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3647,5,3647,88,maxTargetSdk=28&trackingBug=130143562L
+Landroid/net/ConnectivityManager;->setProcessDefaultNetworkForHostResolution(Landroid/net/Network;)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,5462,5,5462,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
diff --git a/current/include/packages/modules/Connectivity/DnsResolver/include/DnsHelperPublic.h b/current/include/packages/modules/Connectivity/DnsResolver/include/DnsHelperPublic.h
new file mode 100644
index 0000000..7c9fc9e
--- /dev/null
+++ b/current/include/packages/modules/Connectivity/DnsResolver/include/DnsHelperPublic.h
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#include <sys/cdefs.h>
+#include <sys/types.h>
+
+__BEGIN_DECLS
+
+/*
+ * Perform any required initialization - including opening any required BPF maps. This function
+ * needs to be called before using other functions of this library.
+ *
+ * Returns 0 on success, a negative POSIX error code (see errno.h) on other failures.
+ */
+int ADnsHelper_init();
+
+/*
+ * The function reads bpf maps and returns whether the given uid has blocked networking or not. The
+ * function is supported starting from Android T.
+ *
+ * |uid| is a Linux/Android UID to be queried. It is a combination of UserID and AppID.
+ * |metered| indicates whether the uid is currently using a billing network.
+ *
+ * Returns 0(false)/1(true) on success, a negative POSIX error code (see errno.h) on other failures.
+ */
+int ADnsHelper_isUidNetworkingBlocked(uid_t uid, bool metered);
+
+__END_DECLS
diff --git a/current/sdk_library/module-lib/framework-connectivity-stubs.jar b/current/sdk_library/module-lib/framework-connectivity-stubs.jar
index 50876ce..fa59377 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-t-stubs.jar b/current/sdk_library/module-lib/framework-connectivity-t-stubs.jar
index 7ef04e0..3ddfb53 100644
--- a/current/sdk_library/module-lib/framework-connectivity-t-stubs.jar
+++ b/current/sdk_library/module-lib/framework-connectivity-t-stubs.jar
diff --git a/current/sdk_library/module-lib/framework-connectivity-t.srcjar b/current/sdk_library/module-lib/framework-connectivity-t.srcjar
index 9b2119c..3565691 100644
--- a/current/sdk_library/module-lib/framework-connectivity-t.srcjar
+++ b/current/sdk_library/module-lib/framework-connectivity-t.srcjar
diff --git a/current/sdk_library/module-lib/framework-connectivity.srcjar b/current/sdk_library/module-lib/framework-connectivity.srcjar
index 78f7dc0..72b8400 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 782e20a..4d55067 100644
--- a/current/sdk_library/module-lib/framework-connectivity.txt
+++ b/current/sdk_library/module-lib/framework-connectivity.txt
@@ -14,6 +14,7 @@ package android.net {
     method @NonNull public static android.util.Range<java.lang.Integer> getIpSecNetIdRange();
     method @Nullable @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_STACK, android.Manifest.permission.NETWORK_SETTINGS}) public android.net.LinkProperties getRedactedLinkPropertiesForPackage(@NonNull android.net.LinkProperties, int, @NonNull String);
     method @Nullable @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_STACK, android.Manifest.permission.NETWORK_SETTINGS}) public android.net.NetworkCapabilities getRedactedNetworkCapabilitiesForPackage(@NonNull android.net.NetworkCapabilities, int, @NonNull String);
+    method @FlaggedApi("com.android.net.flags.support_is_uid_networking_blocked") @RequiresPermission(android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK) public boolean isUidNetworkingBlocked(int, boolean);
     method @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_SETTINGS}) public void registerDefaultNetworkCallbackForUid(int, @NonNull android.net.ConnectivityManager.NetworkCallback, @NonNull android.os.Handler);
     method @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD, android.Manifest.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS}) public void registerSystemDefaultNetworkCallback(@NonNull android.net.ConnectivityManager.NetworkCallback, @NonNull android.os.Handler);
     method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_STACK, android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK}) public void removeUidFromMeteredNetworkAllowList(int);
diff --git a/current/sdk_library/module-lib/framework-connectivity_annotations.zip b/current/sdk_library/module-lib/framework-connectivity_annotations.zip
index 911a554..d62c656 100644
--- a/current/sdk_library/module-lib/framework-connectivity_annotations.zip
+++ b/current/sdk_library/module-lib/framework-connectivity_annotations.zip
diff --git a/current/sdk_library/public/framework-connectivity-stubs.jar b/current/sdk_library/public/framework-connectivity-stubs.jar
index d3eab3b..30b9edf 100644
--- a/current/sdk_library/public/framework-connectivity-stubs.jar
+++ b/current/sdk_library/public/framework-connectivity-stubs.jar
diff --git a/current/sdk_library/public/framework-connectivity.srcjar b/current/sdk_library/public/framework-connectivity.srcjar
index 16f86a9..3061380 100644
--- a/current/sdk_library/public/framework-connectivity.srcjar
+++ b/current/sdk_library/public/framework-connectivity.srcjar
diff --git a/current/sdk_library/system/framework-connectivity-t-stubs.jar b/current/sdk_library/system/framework-connectivity-t-stubs.jar
index 018def5..dca3093 100644
--- a/current/sdk_library/system/framework-connectivity-t-stubs.jar
+++ b/current/sdk_library/system/framework-connectivity-t-stubs.jar
diff --git a/current/sdk_library/system/framework-connectivity-t.srcjar b/current/sdk_library/system/framework-connectivity-t.srcjar
index b27062e..250df62 100644
--- a/current/sdk_library/system/framework-connectivity-t.srcjar
+++ b/current/sdk_library/system/framework-connectivity-t.srcjar
diff --git a/current/sdk_library/system/framework-connectivity-t.txt b/current/sdk_library/system/framework-connectivity-t.txt
index 6c98a4f..23510e1 100644
--- a/current/sdk_library/system/framework-connectivity-t.txt
+++ b/current/sdk_library/system/framework-connectivity-t.txt
@@ -492,12 +492,12 @@ package android.net.thread {
     field @NonNull public static final android.os.Parcelable.Creator<android.net.thread.PendingOperationalDataset> CREATOR;
   }
 
-  @FlaggedApi("com.android.net.thread.flags.thread_enabled") public class ThreadNetworkController {
+  @FlaggedApi("com.android.net.thread.flags.thread_enabled") public final class ThreadNetworkController {
     method public int getThreadVersion();
     field public static final int THREAD_VERSION_1_3 = 4; // 0x4
   }
 
-  @FlaggedApi("com.android.net.thread.flags.thread_enabled") public class ThreadNetworkManager {
+  @FlaggedApi("com.android.net.thread.flags.thread_enabled") public final class ThreadNetworkManager {
     method @NonNull public java.util.List<android.net.thread.ThreadNetworkController> getAllThreadNetworkControllers();
   }
 
diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt
index 37c390f..c88e961 100644
--- a/current/snapshot-creation-build-number.txt
+++ b/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-11003728
\ No newline at end of file
+P65040987
\ No newline at end of file
diff --git a/current/x86/lib/libcom.android.tethering.dns_helper.so b/current/x86/lib/libcom.android.tethering.dns_helper.so
new file mode 100755
index 0000000..dbe9675
--- /dev/null
+++ b/current/x86/lib/libcom.android.tethering.dns_helper.so
diff --git a/current/x86_64/lib/libcom.android.tethering.dns_helper.so b/current/x86_64/lib/libcom.android.tethering.dns_helper.so
new file mode 100755
index 0000000..6480efe
--- /dev/null
+++ b/current/x86_64/lib/libcom.android.tethering.dns_helper.so