commit 25cc809406bac41620f8abb1803167a0fbe768d0
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Apr 03 19:27:46 2025 -0700
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Apr 03 19:27:46 2025 -0700
tree df533063c189b1bf4683e433fe7ad93d6b170ad7
parent b1102cb9f4455c1d7341be229ecdd3b19bb9019a
parent ff3f8d224fe6d982cf11021f2bcd220d8d463db5

Merge cherrypicks of ['googleplex-android-review.googlesource.com/32698852'] into 25Q2-release.

Change-Id: I748da41a1ac2dcb53f1f65f0ecd703ff49333cc4

framework/src/android/net/connectivity/ConnectivityCompatChanges.java

diff --git a/framework/src/android/net/connectivity/ConnectivityCompatChanges.java b/framework/src/android/net/connectivity/ConnectivityCompatChanges.java
index acf8e85..27d605a 100644
--- a/framework/src/android/net/connectivity/ConnectivityCompatChanges.java
+++ b/framework/src/android/net/connectivity/ConnectivityCompatChanges.java
@@ -16,6 +16,7 @@
 package android.net.connectivity;
 
 import android.compat.annotation.ChangeId;
+import android.compat.annotation.Disabled;
 import android.compat.annotation.EnabledAfter;
 import android.compat.annotation.EnabledSince;
 import android.os.Build;
@@ -145,7 +146,7 @@
      * @hide
      */
     @ChangeId
-    @EnabledAfter(targetSdkVersion = 36)
+    @Disabled
     public static final long RESTRICT_LOCAL_NETWORK = 365139289L;
 
     /**