Merge "Make CaptivePortalProbeSpec and CaptivePortalProbeResult as a library" (3db9cfe6) · Commits · e / os / android_frameworks_base

api/system-current.txt

+0 −31

Original line number	Diff line number	Diff line
		@@ -3328,37 +3328,6 @@ package android.net.apf {

		}

		package android.net.captiveportal {

		public final class CaptivePortalProbeResult {
		ctor public CaptivePortalProbeResult(int);
		ctor public CaptivePortalProbeResult(int, @Nullable String, @Nullable String);
		ctor public CaptivePortalProbeResult(int, @Nullable String, @Nullable String, @Nullable android.net.captiveportal.CaptivePortalProbeSpec);
		method public boolean isFailed();
		method public boolean isPartialConnectivity();
		method public boolean isPortal();
		method public boolean isSuccessful();
		field @NonNull public static final android.net.captiveportal.CaptivePortalProbeResult FAILED;
		field public static final int FAILED_CODE = 599; // 0x257
		field public static final android.net.captiveportal.CaptivePortalProbeResult PARTIAL;
		field public static final int PORTAL_CODE = 302; // 0x12e
		field @NonNull public static final android.net.captiveportal.CaptivePortalProbeResult SUCCESS;
		field public static final int SUCCESS_CODE = 204; // 0xcc
		field @Nullable public final String detectUrl;
		field @Nullable public final android.net.captiveportal.CaptivePortalProbeSpec probeSpec;
		field @Nullable public final String redirectUrl;
		}

		public abstract class CaptivePortalProbeSpec {
		method @NonNull public String getEncodedSpec();
		method @NonNull public abstract android.net.captiveportal.CaptivePortalProbeResult getResult(int, @Nullable String);
		method @NonNull public java.net.URL getUrl();
		method @NonNull public static java.util.Collection<android.net.captiveportal.CaptivePortalProbeSpec> parseCaptivePortalProbeSpecs(@NonNull String);
		method @Nullable public static android.net.captiveportal.CaptivePortalProbeSpec parseSpecOrNull(@Nullable String);
		}

		}

		package android.net.metrics {

		public final class ApfProgramEvent implements android.net.metrics.IpConnectivityLog.Event {

api/test-current.txt

+0 −31

Original line number	Diff line number	Diff line
		@@ -747,37 +747,6 @@ package android.net.apf {

		}

		package android.net.captiveportal {

		public final class CaptivePortalProbeResult {
		ctor public CaptivePortalProbeResult(int);
		ctor public CaptivePortalProbeResult(int, @Nullable String, @Nullable String);
		ctor public CaptivePortalProbeResult(int, @Nullable String, @Nullable String, @Nullable android.net.captiveportal.CaptivePortalProbeSpec);
		method public boolean isFailed();
		method public boolean isPartialConnectivity();
		method public boolean isPortal();
		method public boolean isSuccessful();
		field @NonNull public static final android.net.captiveportal.CaptivePortalProbeResult FAILED;
		field public static final int FAILED_CODE = 599; // 0x257
		field public static final android.net.captiveportal.CaptivePortalProbeResult PARTIAL;
		field public static final int PORTAL_CODE = 302; // 0x12e
		field @NonNull public static final android.net.captiveportal.CaptivePortalProbeResult SUCCESS;
		field public static final int SUCCESS_CODE = 204; // 0xcc
		field @Nullable public final String detectUrl;
		field @Nullable public final android.net.captiveportal.CaptivePortalProbeSpec probeSpec;
		field @Nullable public final String redirectUrl;
		}

		public abstract class CaptivePortalProbeSpec {
		method @NonNull public String getEncodedSpec();
		method @NonNull public abstract android.net.captiveportal.CaptivePortalProbeResult getResult(int, @Nullable String);
		method @NonNull public java.net.URL getUrl();
		method @NonNull public static java.util.Collection<android.net.captiveportal.CaptivePortalProbeSpec> parseCaptivePortalProbeSpecs(@NonNull String);
		method @Nullable public static android.net.captiveportal.CaptivePortalProbeSpec parseSpecOrNull(@Nullable String);
		}

		}

		package android.net.metrics {

		public final class ApfProgramEvent implements android.net.metrics.IpConnectivityLog.Event {

packages/CaptivePortalLogin/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ android_app {
		static_libs: [
		"android-support-v4",
		"metrics-constants-protos",
		"captiveportal-lib",
		],
		manifest: "AndroidManifest.xml",
		}

packages/NetworkStack/Android.bp

+10 −0

Original line number	Diff line number	Diff line
		@@ -14,6 +14,15 @@
		// limitations under the License.
		//

		java_library {
		name: "captiveportal-lib",
		srcs: ["common/*/.java"],
		libs: [
		"androidx.annotation_annotation",
		],
		sdk_version: "system_current",
		}

		java_defaults {
		name: "NetworkStackCommon",
		sdk_version: "system_current",
		@@ -35,6 +44,7 @@ android_library {
		"networkstack-aidl-interfaces-java",
		"datastallprotosnano",
		"networkstackprotosnano",
		"captiveportal-lib",
		],
		manifest: "AndroidManifestBase.xml",
		}

core/java/android/net/captiveportal/CaptivePortalProbeResult.java→packages/NetworkStack/common/CaptivePortalProbeResult.java

+2 −6

Original line number	Diff line number	Diff line
		@@ -16,17 +16,13 @@

		package android.net.captiveportal;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.SystemApi;
		import android.annotation.TestApi;
		import androidx.annotation.NonNull;
		import androidx.annotation.Nullable;

		/**
		* Result of calling isCaptivePortal().
		* @hide
		*/
		@SystemApi
		@TestApi
		public final class CaptivePortalProbeResult {
		public static final int SUCCESS_CODE = 204;
		public static final int FAILED_CODE = 599;