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

18 files changed, 60 insertions, 47 deletions

diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index 1ba82c5..0705553 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: "P65040987"
+    build_id: "P65184093"
     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/arm/lib/libcom.android.tethering.dns_helper.so b/current/arm/lib/libcom.android.tethering.dns_helper.so
index 69a3750..d1d09b5 100755
--- a/current/arm/lib/libcom.android.tethering.dns_helper.so
+++ b/current/arm/lib/libcom.android.tethering.dns_helper.so
diff --git a/current/arm/lib/libnetd_updatable.so b/current/arm/lib/libnetd_updatable.so
index 4d89659..ebcc329 100755
--- a/current/arm/lib/libnetd_updatable.so
+++ b/current/arm/lib/libnetd_updatable.so
diff --git a/current/arm64/lib/libcom.android.tethering.dns_helper.so b/current/arm64/lib/libcom.android.tethering.dns_helper.so
index 45492ab..694fe43 100755
--- a/current/arm64/lib/libcom.android.tethering.dns_helper.so
+++ b/current/arm64/lib/libcom.android.tethering.dns_helper.so
diff --git a/current/arm64/lib/libnetd_updatable.so b/current/arm64/lib/libnetd_updatable.so
index 559718c..172fdc6 100755
--- a/current/arm64/lib/libnetd_updatable.so
+++ b/current/arm64/lib/libnetd_updatable.so
diff --git a/current/hiddenapi/filtered-flags.csv b/current/hiddenapi/filtered-flags.csv
index f03444a..bb198e5 100644
--- a/current/hiddenapi/filtered-flags.csv
+++ b/current/hiddenapi/filtered-flags.csv
@@ -1721,6 +1721,11 @@ Landroid/net/LinkProperties;->setUsePrivateDns(Z)V,sdk,system-api,test-api
 Landroid/net/LinkProperties;->setValidatedPrivateDnsServers(Ljava/util/Collection;)V,sdk,system-api,test-api
 Landroid/net/LinkProperties;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/LinkProperties;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
+Landroid/net/LocalNetworkInfo$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/net/LocalNetworkInfo$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/net/LocalNetworkInfo;->describeContents()I,public-api,sdk,system-api,test-api
+Landroid/net/LocalNetworkInfo;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/LocalNetworkInfo;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
 Landroid/net/MacAddress$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/net/MacAddress$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/net/MacAddress;-><init>(J)V,lo-prio,max-target-o
diff --git a/current/hiddenapi/filtered-stub-flags.csv b/current/hiddenapi/filtered-stub-flags.csv
index 4fc789b..edb423a 100644
--- a/current/hiddenapi/filtered-stub-flags.csv
+++ b/current/hiddenapi/filtered-stub-flags.csv
@@ -957,6 +957,11 @@ Landroid/net/LinkProperties;->setUsePrivateDns(Z)V,system-api,test-api
 Landroid/net/LinkProperties;->setValidatedPrivateDnsServers(Ljava/util/Collection;)V,system-api,test-api
 Landroid/net/LinkProperties;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Landroid/net/LinkProperties;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
+Landroid/net/LocalNetworkInfo$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/net/LocalNetworkInfo$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/net/LocalNetworkInfo;->describeContents()I,public-api,system-api,test-api
+Landroid/net/LocalNetworkInfo;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
+Landroid/net/LocalNetworkInfo;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
 Landroid/net/MacAddress$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/net/MacAddress$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/net/MacAddress;->BROADCAST_ADDRESS:Landroid/net/MacAddress;,public-api,system-api,test-api
diff --git a/current/hiddenapi/index.csv b/current/hiddenapi/index.csv
index a9d3eff..dd0f1d9 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,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/ConnectivityManager$PacketKeepalive;->stop()V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2348,9,2348,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager$PacketKeepaliveCallback;-><init>()V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2272,9,2272,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager$PacketKeepaliveCallback;->onStarted()V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2276,9,2276,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager$PacketKeepaliveCallback;->onStopped()V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2281,9,2281,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager$PacketKeepaliveCallback;->onError(I)V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2286,9,2286,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->INET_CONDITION_ACTION:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,380,5,380,25,
+Landroid/net/ConnectivityManager;->ACTION_TETHER_STATE_CHANGED:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,395,5,395,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->EXTRA_AVAILABLE_TETHER:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,404,5,404,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->EXTRA_ACTIVE_TETHER:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,419,5,419,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->EXTRA_ERRORED_TETHER:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,428,5,428,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->TYPE_MOBILE_FOTA:I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,692,5,692,88,maxTargetSdk=28&trackingBug=130143562L
+Landroid/net/ConnectivityManager;->TYPE_MOBILE_IMS:I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,701,5,701,25,
+Landroid/net/ConnectivityManager;->TYPE_MOBILE_CBS:I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,710,5,710,88,maxTargetSdk=28&trackingBug=130143562L
+Landroid/net/ConnectivityManager;->TYPE_MOBILE_IA:I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,729,5,729,25,
+Landroid/net/ConnectivityManager;->TYPE_MOBILE_EMERGENCY:I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,739,5,739,88,maxTargetSdk=28&trackingBug=130143562L
+Landroid/net/ConnectivityManager;->mService:Landroid/net/IConnectivityManager;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,976,5,976,88,maxTargetSdk=28&trackingBug=130143562L
+Landroid/net/ConnectivityManager;->getNetworkTypeName(I)Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1175,5,1175,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->isNetworkTypeMobile(I)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1244,5,1244,88,maxTargetSdk=28&trackingBug=130143562L
+Landroid/net/ConnectivityManager;->getActiveNetworkInfoForUid(I)Landroid/net/NetworkInfo;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1616,5,1616,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->getNetworkForType(I)Landroid/net/Network;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1735,5,1735,25,
+Landroid/net/ConnectivityManager;->getDefaultNetworkCapabilitiesForUser(I)[Landroid/net/NetworkCapabilities;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1772,5,1772,25,
+Landroid/net/ConnectivityManager;->getActiveLinkProperties()Landroid/net/LinkProperties;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1796,5,1796,88,maxTargetSdk=28&trackingBug=109783091L
+Landroid/net/ConnectivityManager;->getLinkProperties(I)Landroid/net/LinkProperties;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1821,5,1821,88,maxTargetSdk=28&trackingBug=130143562L
+Landroid/net/ConnectivityManager;->networkCapabilitiesForFeature(ILjava/lang/String;)Landroid/net/NetworkCapabilities;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2058,5,2058,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->sLegacyRequests:Ljava/util/HashMap;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2144,5,2144,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->requestNetworkForFeatureLocked(Landroid/net/NetworkCapabilities;)Landroid/net/NetworkRequest;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2173,5,2173,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->removeRequestForFeature(Landroid/net/NetworkCapabilities;)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2203,5,2203,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,2449,5,2449,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->requestRouteToHostAddress(ILjava/net/InetAddress;)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2649,5,2649,25,
+Landroid/net/ConnectivityManager;->setBackgroundDataSetting(Z)V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2703,5,2703,25,
+Landroid/net/ConnectivityManager;->getMobileDataEnabled()Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2713,5,2713,25,
+Landroid/net/ConnectivityManager;->from(Landroid/content/Context;)Landroid/net/ConnectivityManager;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2840,5,2840,25,
+Landroid/net/ConnectivityManager;->getInstance()Landroid/net/ConnectivityManager;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2885,5,2885,25,
+Landroid/net/ConnectivityManager;->getTetherableIfaces()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2903,5,2903,25,
+Landroid/net/ConnectivityManager;->getTetheredIfaces()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2918,5,2918,25,
+Landroid/net/ConnectivityManager;->getTetheringErroredIfaces()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2939,5,2939,25,
+Landroid/net/ConnectivityManager;->tether(Ljava/lang/String;)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2983,5,2983,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->untether(Ljava/lang/String;)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3007,5,3007,25,
+Landroid/net/ConnectivityManager;->getTetherableUsbRegexs()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3245,5,3245,25,
+Landroid/net/ConnectivityManager;->getTetherableWifiRegexs()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3263,5,3263,25,
+Landroid/net/ConnectivityManager;->getTetherableBluetoothRegexs()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3282,5,3282,25,
+Landroid/net/ConnectivityManager;->setUsbTethering(Z)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3306,5,3306,25,
+Landroid/net/ConnectivityManager;->getLastTetherError(Ljava/lang/String;)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3422,5,3422,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->isNetworkSupported(I)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3671,5,3671,88,maxTargetSdk=28&trackingBug=130143562L
+Landroid/net/ConnectivityManager;->setProcessDefaultNetworkForHostResolution(Landroid/net/Network;)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,5514,5,5514,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/hiddenapi/signature-patterns.csv b/current/hiddenapi/signature-patterns.csv
index d1cd51a..92318cc 100644
--- a/current/hiddenapi/signature-patterns.csv
+++ b/current/hiddenapi/signature-patterns.csv
@@ -69,6 +69,7 @@ android/net/IpSecUdpEncapResponse
 android/net/KeepalivePacketData
 android/net/LinkAddress
 android/net/LinkProperties
+android/net/LocalNetworkInfo
 android/net/MacAddress
 android/net/NattKeepalivePacketData
 android/net/Network
diff --git a/current/sdk_library/module-lib/framework-connectivity-stubs.jar b/current/sdk_library/module-lib/framework-connectivity-stubs.jar
index fa59377..c024370 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 72b8400..2b53cf1 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 4d55067..bfb4981 100644
--- a/current/sdk_library/module-lib/framework-connectivity.txt
+++ b/current/sdk_library/module-lib/framework-connectivity.txt
@@ -45,6 +45,7 @@ package android.net {
     field public static final int BLOCKED_METERED_REASON_DATA_SAVER = 65536; // 0x10000
     field public static final int BLOCKED_METERED_REASON_MASK = -65536; // 0xffff0000
     field public static final int BLOCKED_METERED_REASON_USER_RESTRICTED = 131072; // 0x20000
+    field @FlaggedApi("com.android.net.flags.basic_background_restrictions_enabled") public static final int BLOCKED_REASON_APP_BACKGROUND = 64; // 0x40
     field public static final int BLOCKED_REASON_APP_STANDBY = 4; // 0x4
     field public static final int BLOCKED_REASON_BATTERY_SAVER = 1; // 0x1
     field public static final int BLOCKED_REASON_DOZE = 2; // 0x2
@@ -52,6 +53,7 @@ package android.net {
     field public static final int BLOCKED_REASON_LOW_POWER_STANDBY = 32; // 0x20
     field public static final int BLOCKED_REASON_NONE = 0; // 0x0
     field public static final int BLOCKED_REASON_RESTRICTED_MODE = 8; // 0x8
+    field @FlaggedApi("com.android.net.flags.basic_background_restrictions_enabled") public static final int FIREWALL_CHAIN_BACKGROUND = 6; // 0x6
     field public static final int FIREWALL_CHAIN_DOZABLE = 1; // 0x1
     field public static final int FIREWALL_CHAIN_LOW_POWER_STANDBY = 5; // 0x5
     field public static final int FIREWALL_CHAIN_OEM_DENY_1 = 7; // 0x7
diff --git a/current/sdk_library/module-lib/framework-connectivity_annotations.zip b/current/sdk_library/module-lib/framework-connectivity_annotations.zip
index d62c656..df9140d 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/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt
index c88e961..a7e87e6 100644
--- a/current/snapshot-creation-build-number.txt
+++ b/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-P65040987
\ No newline at end of file
+P65184093
\ 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
index dbe9675..d95dc22 100755
--- a/current/x86/lib/libcom.android.tethering.dns_helper.so
+++ b/current/x86/lib/libcom.android.tethering.dns_helper.so
diff --git a/current/x86/lib/libnetd_updatable.so b/current/x86/lib/libnetd_updatable.so
index 912099d..b751dd0 100755
--- a/current/x86/lib/libnetd_updatable.so
+++ b/current/x86/lib/libnetd_updatable.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
index 6480efe..60c637a 100755
--- a/current/x86_64/lib/libcom.android.tethering.dns_helper.so
+++ b/current/x86_64/lib/libcom.android.tethering.dns_helper.so
diff --git a/current/x86_64/lib/libnetd_updatable.so b/current/x86_64/lib/libnetd_updatable.so
index 38afa85..a44538e 100755
--- a/current/x86_64/lib/libnetd_updatable.so
+++ b/current/x86_64/lib/libnetd_updatable.so