diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2019-03-20 05:40:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-03-20 05:40:41 +0000 |
| commit | 31e3f2e7345bf55c856d9a8156514afccc96e8d3 (patch) | |
| tree | cd6c37524f59363a22fbe61e8767af7ec3658b77 /core/java | |
| parent | e1f19a6ef900581e1d23291ab41f55e0db047ced (diff) | |
| parent | e501d2ab23115351128cb45be761af02791e2e11 (diff) | |
Merge "Add documentation for CaptivePortal APP_RETURN_*"
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/net/CaptivePortal.java | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/core/java/android/net/CaptivePortal.java b/core/java/android/net/CaptivePortal.java index 3ab35e1eebf0..ba7323ddbd81 100644 --- a/core/java/android/net/CaptivePortal.java +++ b/core/java/android/net/CaptivePortal.java @@ -29,15 +29,33 @@ import android.os.RemoteException; * {@code ACTION_CAPTIVE_PORTAL_SIGN_IN} activity. */ public class CaptivePortal implements Parcelable { - /** @hide */ + /** + * Response code from the captive portal application, indicating that the portal was dismissed + * and the network should be re-validated. + * @see ICaptivePortal#appResponse(int) + * @see android.net.INetworkMonitor#notifyCaptivePortalAppFinished(int) + * @hide + */ @SystemApi @TestApi public static final int APP_RETURN_DISMISSED = 0; - /** @hide */ + /** + * Response code from the captive portal application, indicating that the user did not login and + * does not want to use the captive portal network. + * @see ICaptivePortal#appResponse(int) + * @see android.net.INetworkMonitor#notifyCaptivePortalAppFinished(int) + * @hide + */ @SystemApi @TestApi public static final int APP_RETURN_UNWANTED = 1; - /** @hide */ + /** + * Response code from the captive portal application, indicating that the user does not wish to + * login but wants to use the captive portal network as-is. + * @see ICaptivePortal#appResponse(int) + * @see android.net.INetworkMonitor#notifyCaptivePortalAppFinished(int) + * @hide + */ @SystemApi @TestApi public static final int APP_RETURN_WANTED_AS_IS = 2; |