diff options
| author | Prerepa Viswanadham <dham@google.com> | 2015-04-10 15:58:10 -0700 |
|---|---|---|
| committer | Prerepa Viswanadham <dham@google.com> | 2015-04-10 15:58:10 -0700 |
| commit | 57bf2a8a38e929f00f3323cf97a8ea7a9af900ce (patch) | |
| tree | 16549920278bc3572f80037303d63991705a53e7 /packages/CaptivePortalLogin | |
| parent | 3932bb41535f91b03610147e24a244cf7e4152cb (diff) | |
| parent | e593d0aec6430d98731d9751facd0414a1c9c6a2 (diff) | |
| download | frameworks_base-57bf2a8a38e929f00f3323cf97a8ea7a9af900ce.zip frameworks_base-57bf2a8a38e929f00f3323cf97a8ea7a9af900ce.tar.gz frameworks_base-57bf2a8a38e929f00f3323cf97a8ea7a9af900ce.tar.bz2 | |
Merge commit 'e593d0a' into merge_work
Change-Id: I4f8ae40fc446cd9cda4d5c6ec99469a98dda595b
Diffstat (limited to 'packages/CaptivePortalLogin')
| -rw-r--r-- | packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java b/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java index 2a9f59f..e4054ac 100644 --- a/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java +++ b/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java @@ -97,7 +97,7 @@ public class CaptivePortalLoginActivity extends Activity { final ConnectivityManager cm = ConnectivityManager.from(this); final Network network = new Network(mNetId); // Also initializes proxy system properties. - cm.setProcessDefaultNetwork(network); + cm.bindProcessToNetwork(network); // Proxy system properties must be initialized before setContentView is called because // setContentView initializes the WebView logic which in turn reads the system properties. |