Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 111e1c35 authored Jan 21, 2019 by Remi NGUYEN VAN

Migrate ICaptivePortal to stable AIDL

Also add required API for the captive portal app to stop using hidden
members.

Test: atest FrameworksNetTests NetworkStackTests
Bug: 112869080
Change-Id: I62b457e709fa199822bb8f80b0eab990be4ded93

parent 3ebfb650

Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -207,7 +207,6 @@ java_defaults {
		"core/java/android/hardware/soundtrigger/IRecognitionStatusCallback.aidl",
		"core/java/android/hardware/usb/IUsbManager.aidl",
		"core/java/android/hardware/usb/IUsbSerialReader.aidl",
		"core/java/android/net/ICaptivePortal.aidl",
		"core/java/android/net/IConnectivityManager.aidl",
		"core/java/android/hardware/ISensorPrivacyListener.aidl",
		"core/java/android/hardware/ISensorPrivacyManager.aidl",
		@@ -884,6 +883,7 @@ aidl_interface {
		srcs: [
		"core/java/android/net/ApfCapabilitiesParcelable.aidl",
		"core/java/android/net/DhcpResultsParcelable.aidl",
		"core/java/android/net/ICaptivePortal.aidl",
		"core/java/android/net/INetworkMonitor.aidl",
		"core/java/android/net/INetworkMonitorCallbacks.aidl",
		"core/java/android/net/IIpMemoryStore.aidl",

api/system-current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -3895,6 +3895,8 @@ package android.metrics {
		package android.net {

		public class CaptivePortal implements android.os.Parcelable {
		ctor public CaptivePortal(android.os.IBinder);
		method public void useNetwork();
		field public static final int APP_RETURN_DISMISSED = 0; // 0x0
		field public static final int APP_RETURN_UNWANTED = 1; // 0x1
		field public static final int APP_RETURN_WANTED_AS_IS = 2; // 0x2

api/test-current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -781,6 +781,8 @@ package android.media.audiofx {
		package android.net {

		public class CaptivePortal implements android.os.Parcelable {
		ctor public CaptivePortal(android.os.IBinder);
		method public void useNetwork();
		field public static final int APP_RETURN_DISMISSED = 0; // 0x0
		field public static final int APP_RETURN_UNWANTED = 1; // 0x1
		field public static final int APP_RETURN_WANTED_AS_IS = 2; // 0x2

core/java/android/net/CaptivePortal.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -45,6 +45,8 @@ public class CaptivePortal implements Parcelable {
		private final IBinder mBinder;

		/** @hide */
		@SystemApi
		@TestApi
		public CaptivePortal(IBinder binder) {
		mBinder = binder;
		}
		@@ -107,6 +109,8 @@ public class CaptivePortal implements Parcelable {
		* connectivity for apps because the captive portal is still in place.
		* @hide
		*/
		@SystemApi
		@TestApi
		public void useNetwork() {
		try {
		ICaptivePortal.Stub.asInterface(mBinder).appResponse(APP_RETURN_WANTED_AS_IS);

core/java/android/net/ICaptivePortal.aidl

+2 −3

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@ package android.net;
		* Interface to inform NetworkMonitor of decisions of app handling captive portal.
		* @hide
		*/
		interface ICaptivePortal
		{
		oneway void appResponse(int response);
		oneway interface ICaptivePortal {
		void appResponse(int response);
		}