Merge "Migrate ICaptivePortal to stable AIDL" am: eb7c53718a

am: 03ee99b190

Change-Id: I6fa53f6f7c45aa801a1e48e04bdb3ca6004f565d
This commit is contained in:
Remi NGUYEN VAN
2019-01-22 14:35:29 -08:00
committed by android-build-merger

View File

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