Snap for 8056399 from 64448a30675d5904821ad1ce92d9dcb75852a8dd to mainline-media-release Change-Id: I1937f07ab4dc0fd0f2f362e19154b5f04fef144a
diff --git a/Android.bp b/Android.bp index 026870c..b4487f7 100644 --- a/Android.bp +++ b/Android.bp
@@ -158,10 +158,10 @@ // stable and have no defined version number. These could be called 10000, but they use the next // integer so if the next SDK release happens to use that integer, we don't need to rename them. java_library { - name: "NetworkStackApi32Shims", + name: "NetworkStackApi33Shims", defaults: ["NetworkStackShimsDefaults"], srcs: [ - "apishim/32/**/*.java", + "apishim/33/**/*.java", ], libs: [ "NetworkStackShimsCommon", @@ -185,7 +185,7 @@ "NetworkStackApi29Shims", "NetworkStackApi30Shims", "NetworkStackApi31Shims", - "NetworkStackApi32Shims", + "NetworkStackApi33Shims", ], sdk_version: "module_current", visibility: [
diff --git a/apishim/32/com/android/networkstack/apishim/CaptivePortalDataShimImpl.java b/apishim/33/com/android/networkstack/apishim/CaptivePortalDataShimImpl.java similarity index 92% rename from apishim/32/com/android/networkstack/apishim/CaptivePortalDataShimImpl.java rename to apishim/33/com/android/networkstack/apishim/CaptivePortalDataShimImpl.java index 2056b1b..63fa021 100644 --- a/apishim/32/com/android/networkstack/apishim/CaptivePortalDataShimImpl.java +++ b/apishim/33/com/android/networkstack/apishim/CaptivePortalDataShimImpl.java
@@ -27,7 +27,7 @@ /** * Compatibility implementation of {@link CaptivePortalDataShim}. */ -@RequiresApi(Build.VERSION_CODES.S) // Change to T when version code available, and adding T methods +@RequiresApi(Build.VERSION_CODES.TIRAMISU) public class CaptivePortalDataShimImpl extends com.android.networkstack.apishim.api31.CaptivePortalDataShimImpl { // Currently identical to the API 31 shim, so inherit everything
diff --git a/apishim/32/com/android/networkstack/apishim/ConnectivityManagerShimImpl.java b/apishim/33/com/android/networkstack/apishim/ConnectivityManagerShimImpl.java similarity index 92% rename from apishim/32/com/android/networkstack/apishim/ConnectivityManagerShimImpl.java rename to apishim/33/com/android/networkstack/apishim/ConnectivityManagerShimImpl.java index a7aa0c8..7675960 100644 --- a/apishim/32/com/android/networkstack/apishim/ConnectivityManagerShimImpl.java +++ b/apishim/33/com/android/networkstack/apishim/ConnectivityManagerShimImpl.java
@@ -26,7 +26,7 @@ /** * Compatibility implementation of {@link ConnectivityManagerShim}. */ -@RequiresApi(Build.VERSION_CODES.S) // Change to T when version code available, and adding T methods +@RequiresApi(Build.VERSION_CODES.TIRAMISU) public class ConnectivityManagerShimImpl extends com.android.networkstack.apishim.api31.ConnectivityManagerShimImpl { // Currently identical to the API 31 shim, so inherit everything
diff --git a/apishim/32/com/android/networkstack/apishim/ConstantsShim.java b/apishim/33/com/android/networkstack/apishim/ConstantsShim.java similarity index 96% rename from apishim/32/com/android/networkstack/apishim/ConstantsShim.java rename to apishim/33/com/android/networkstack/apishim/ConstantsShim.java index 0a5b555..6d146f5 100644 --- a/apishim/32/com/android/networkstack/apishim/ConstantsShim.java +++ b/apishim/33/com/android/networkstack/apishim/ConstantsShim.java
@@ -29,5 +29,5 @@ * the shimmed objects and methods themselves. */ @VisibleForTesting - public static final int VERSION = 32; + public static final int VERSION = 33; }
diff --git a/apishim/32/com/android/networkstack/apishim/NetworkInformationShimImpl.java b/apishim/33/com/android/networkstack/apishim/NetworkInformationShimImpl.java similarity index 91% rename from apishim/32/com/android/networkstack/apishim/NetworkInformationShimImpl.java rename to apishim/33/com/android/networkstack/apishim/NetworkInformationShimImpl.java index 28aa75c..d51ef40 100644 --- a/apishim/32/com/android/networkstack/apishim/NetworkInformationShimImpl.java +++ b/apishim/33/com/android/networkstack/apishim/NetworkInformationShimImpl.java
@@ -25,7 +25,7 @@ /** * Compatibility implementation of {@link NetworkInformationShim}. */ -@RequiresApi(Build.VERSION_CODES.S) // Change to T when version code available, and adding T methods +@RequiresApi(Build.VERSION_CODES.TIRAMISU) public class NetworkInformationShimImpl extends com.android.networkstack.apishim.api31.NetworkInformationShimImpl { // Currently identical to the API 31 shim, so inherit everything
diff --git a/apishim/32/com/android/networkstack/apishim/NetworkRequestShimImpl.java b/apishim/33/com/android/networkstack/apishim/NetworkRequestShimImpl.java similarity index 86% rename from apishim/32/com/android/networkstack/apishim/NetworkRequestShimImpl.java rename to apishim/33/com/android/networkstack/apishim/NetworkRequestShimImpl.java index 95ae5ba..72dfef2 100644 --- a/apishim/32/com/android/networkstack/apishim/NetworkRequestShimImpl.java +++ b/apishim/33/com/android/networkstack/apishim/NetworkRequestShimImpl.java
@@ -23,9 +23,9 @@ import com.android.networkstack.apishim.common.NetworkRequestShim; /** - * Implementation of {@link NetworkRequestShim} for API 31. + * Implementation of {@link NetworkRequestShim} for API 33. */ -@RequiresApi(Build.VERSION_CODES.S) // Change to T when version code available, and adding T methods +@RequiresApi(Build.VERSION_CODES.TIRAMISU) public class NetworkRequestShimImpl extends com.android.networkstack.apishim.api31.NetworkRequestShimImpl { // Currently identical to the API 31 shim, so inherit everything
diff --git a/apishim/32/com/android/networkstack/apishim/NetworkShimImpl.java b/apishim/33/com/android/networkstack/apishim/NetworkShimImpl.java similarity index 91% rename from apishim/32/com/android/networkstack/apishim/NetworkShimImpl.java rename to apishim/33/com/android/networkstack/apishim/NetworkShimImpl.java index 2e31a78..0968c4c 100644 --- a/apishim/32/com/android/networkstack/apishim/NetworkShimImpl.java +++ b/apishim/33/com/android/networkstack/apishim/NetworkShimImpl.java
@@ -25,7 +25,7 @@ /** * Compatibility implementation of {@link com.android.networkstack.apishim.common.NetworkShim}. */ -@RequiresApi(Build.VERSION_CODES.S) // Change to T when version code available, and adding T methods +@RequiresApi(Build.VERSION_CODES.TIRAMISU) public class NetworkShimImpl extends com.android.networkstack.apishim.api30.NetworkShimImpl { // Currently, this is the same as the API 31 shim, so inherit everything from that. protected NetworkShimImpl(@NonNull Network network) {
diff --git a/apishim/32/com/android/networkstack/apishim/SettingsShimImpl.java b/apishim/33/com/android/networkstack/apishim/SettingsShimImpl.java similarity index 90% rename from apishim/32/com/android/networkstack/apishim/SettingsShimImpl.java rename to apishim/33/com/android/networkstack/apishim/SettingsShimImpl.java index 46d2102..cd3a463 100644 --- a/apishim/32/com/android/networkstack/apishim/SettingsShimImpl.java +++ b/apishim/33/com/android/networkstack/apishim/SettingsShimImpl.java
@@ -23,9 +23,9 @@ import com.android.networkstack.apishim.common.SettingsShim; /** - * Compatibility implementation of {@link SettingsShim} for API 31. + * Compatibility implementation of {@link SettingsShim} for API 33. */ -@RequiresApi(Build.VERSION_CODES.S) // Change to T when version code available, and adding T methods +@RequiresApi(Build.VERSION_CODES.TIRAMISU) public class SettingsShimImpl extends com.android.networkstack.apishim.api30.SettingsShimImpl { // Currently identical to the API 31 shim, so inherit everything
diff --git a/apishim/32/com/android/networkstack/apishim/SocketUtilsShimImpl.java b/apishim/33/com/android/networkstack/apishim/SocketUtilsShimImpl.java similarity index 91% rename from apishim/32/com/android/networkstack/apishim/SocketUtilsShimImpl.java rename to apishim/33/com/android/networkstack/apishim/SocketUtilsShimImpl.java index 2f4e500..d4ab534 100644 --- a/apishim/32/com/android/networkstack/apishim/SocketUtilsShimImpl.java +++ b/apishim/33/com/android/networkstack/apishim/SocketUtilsShimImpl.java
@@ -23,7 +23,7 @@ /** * Implementation of {@link com.android.networkstack.apishim.common.SocketUtilsShim}. */ -@RequiresApi(Build.VERSION_CODES.S) // Change to T when version code available, and adding T methods +@RequiresApi(Build.VERSION_CODES.TIRAMISU) public class SocketUtilsShimImpl extends com.android.networkstack.apishim.api30.SocketUtilsShimImpl { // Currently, this is the same as the API 31 shim, so inherit everything from that.