Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrate ICaptivePortal to stable AIDL

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

Test: atest FrameworksNetTests NetworkStackTests
Bug: 112869080
Merged-In: I62b457e709fa199822bb8f80b0eab990be4ded93
Change-Id: I62b457e709fa199822bb8f80b0eab990be4ded93
This commit is contained in:
Remi NGUYEN VAN
2019-01-20 14:00:34 +09:00
parent 479c0769f1
commit 1e6b186023
5 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Android.bp
View File

@@ -187,7 +187,6 @@ java_defaults {
"core/java/android/hardware/radio/ITunerCallback.aidl",
"core/java/android/hardware/soundtrigger/IRecognitionStatusCallback.aidl",
"core/java/android/hardware/usb/IUsbManager.aidl",
"core/java/android/net/ICaptivePortal.aidl",
"core/java/android/net/IConnectivityManager.aidl",
"core/java/android/net/IIpConnectivityMetrics.aidl",
"core/java/android/net/IEthernetManager.aidl",
@@ -826,6 +825,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",

2
api/system-current.txt
View File

@@ -3025,6 +3025,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

2
api/test-current.txt
View File

@@ -599,6 +599,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

4
core/java/android/net/CaptivePortal.java
View File

@@ -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);

5
core/java/android/net/ICaptivePortal.aidl
View File

@@ -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);
}