| commit | bc38fb169a83a61af544d7a191b3964bdc9b1b5a | [log] [tgz] |
|---|---|---|
| author | Motomu Utsumi <motomuman@google.com> | Thu May 16 02:54:17 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu May 16 02:54:17 2024 +0000 |
| tree | 796c4469c0b680cf01acc71da420b2445f2c031c | |
| parent | 86053cf8aa7cbfd0d6afa02887ccfbf7d91174c7 [diff] | |
| parent | 7e3a2afd40aada08dbb1e406ff2855c305a3d0d2 [diff] |
Merge "Disable the NETWORKINFO_WITHOUT_INTERNET_BLOCKED flag in V" into main am: 7e3a2afd40 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3085485 Change-Id: I88d77809c4065fb23381abfb9e881ff647f8b421 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/framework/src/android/net/connectivity/ConnectivityCompatChanges.java b/framework/src/android/net/connectivity/ConnectivityCompatChanges.java index 56537d9..8701851 100644 --- a/framework/src/android/net/connectivity/ConnectivityCompatChanges.java +++ b/framework/src/android/net/connectivity/ConnectivityCompatChanges.java
@@ -115,7 +115,7 @@ * @hide */ @ChangeId - @EnabledAfter(targetSdkVersion = Build.VERSION_CODES.UPSIDE_DOWN_CAKE) + @EnabledAfter(targetSdkVersion = 35) // TODO: change to VANILLA_ICE_CREAM. public static final long NETWORKINFO_WITHOUT_INTERNET_BLOCKED = 333340911L; private ConnectivityCompatChanges() {