Merge "Migrate ICaptivePortal to stable AIDL" am: eb7c53718a

am: 03ee99b190

Change-Id: I6fa53f6f7c45aa801a1e48e04bdb3ca6004f565d

core/java/android/net/CaptivePortal.java

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