Merge "Add a VERSION constant to the NetworkStack shims." (843ef706) · Commits · e / os / android_packages_modules_NetworkStack

apishim/29/com/android/networkstack/apishim/api29/ConstantsShim.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -16,10 +16,21 @@

		package com.android.networkstack.apishim.api29;

		import androidx.annotation.VisibleForTesting;

		/**
		* Utility class for defining and importing constants from the Android platform.
		*/
		public class ConstantsShim {
		/**
		* Constant that callers can use to determine what version of the shim they are using.
		* Must be the same as the version of the shims.
		* This should only be used by test code. Production code that uses the shims should be using
		* the shimmed objects and methods themselves.
		*/
		@VisibleForTesting
		public static final int VERSION = 29;

		// Constants defined in android.net.ConnectivityDiagnosticsManager.
		public static final int DETECTION_METHOD_DNS_EVENTS = 1;
		public static final int DETECTION_METHOD_TCP_METRICS = 2;

+11 −0

Original line number	Diff line number	Diff line
		@@ -18,10 +18,21 @@ package com.android.networkstack.apishim;

		import static android.net.ConnectivityDiagnosticsManager.DataStallReport;

		import androidx.annotation.VisibleForTesting;

		/**
		* Utility class for defining and importing constants from the Android platform.
		*/
		public class ConstantsShim extends com.android.networkstack.apishim.api29.ConstantsShim {
		/**
		* Constant that callers can use to determine what version of the shim they are using.
		* Must be the same as the version of the shims.
		* This should only be used by test code. Production code that uses the shims should be using
		* the shimmed objects and methods themselves.
		*/
		@VisibleForTesting
		public static final int VERSION = 30;

		public static final int DETECTION_METHOD_DNS_EVENTS =
		DataStallReport.DETECTION_METHOD_DNS_EVENTS;
		public static final int DETECTION_METHOD_TCP_METRICS =