diff options
author | Paul Jensen <pauljensen@google.com> | 2015-07-10 15:33:38 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-10 15:33:38 +0000 |
commit | ca36baafef8024973ab8aebb54913a96db3d0e77 (patch) | |
tree | fab07db92191e10677e3b225ebe15a51fb429ce2 /packages/CaptivePortalLogin | |
parent | b9d7bba5c5453f894608971fed44aed023dcd6ba (diff) | |
parent | 2cb16d2e71398fcb73e3c7ecba093a4bae4490cb (diff) | |
download | frameworks_base-ca36baafef8024973ab8aebb54913a96db3d0e77.zip frameworks_base-ca36baafef8024973ab8aebb54913a96db3d0e77.tar.gz frameworks_base-ca36baafef8024973ab8aebb54913a96db3d0e77.tar.bz2 |
am 2cb16d2e: am 75a43340: am 00c64f7c: Merge "Add android.net.CaptivePortal class for captive-portal-handling-app callbacks" into mnc-dev
* commit '2cb16d2e71398fcb73e3c7ecba093a4bae4490cb':
Add android.net.CaptivePortal class for captive-portal-handling-app callbacks
Diffstat (limited to 'packages/CaptivePortalLogin')
-rw-r--r-- | packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java b/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java index ddbcd78..a489f94 100644 --- a/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java +++ b/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java @@ -21,6 +21,7 @@ import android.app.LoadedApk; import android.content.Context; import android.content.Intent; import android.graphics.Bitmap; +import android.net.CaptivePortal; import android.net.ConnectivityManager; import android.net.ConnectivityManager.NetworkCallback; import android.net.Network; @@ -62,7 +63,7 @@ public class CaptivePortalLoginActivity extends Activity { private URL mURL; private Network mNetwork; - private String mResponseToken; + private CaptivePortal mCaptivePortal; private NetworkCallback mNetworkCallback; private ConnectivityManager mCm; private boolean mLaunchBrowser = false; @@ -83,7 +84,7 @@ public class CaptivePortalLoginActivity extends Activity { done(Result.WANTED_AS_IS); } mNetwork = getIntent().getParcelableExtra(ConnectivityManager.EXTRA_NETWORK); - mResponseToken = getIntent().getStringExtra(ConnectivityManager.EXTRA_CAPTIVE_PORTAL_TOKEN); + mCaptivePortal = getIntent().getParcelableExtra(ConnectivityManager.EXTRA_CAPTIVE_PORTAL); // Also initializes proxy system properties. mCm.bindProcessToNetwork(mNetwork); @@ -155,13 +156,13 @@ public class CaptivePortalLoginActivity extends Activity { } switch (result) { case DISMISSED: - mCm.reportCaptivePortalDismissed(mNetwork, mResponseToken); + mCaptivePortal.reportCaptivePortalDismissed(); break; case UNWANTED: - mCm.ignoreNetworkWithCaptivePortal(mNetwork, mResponseToken); + mCaptivePortal.ignoreNetwork(); break; case WANTED_AS_IS: - mCm.useNetworkWithCaptivePortal(mNetwork, mResponseToken); + mCaptivePortal.useNetwork(); break; } finish(); |