Merge "Migrate ICaptivePortal to stable AIDL"

This commit is contained in:
Lorenzo Colitti
2019-01-22 15:38:07 +00:00
committed by Android (Google) Code Review

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