diff options
author | Hui Lu <huilu@google.com> | 2014-02-25 17:53:41 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-02-25 17:53:41 +0000 |
commit | 95e3cba1f66af5594b5bdc210426ced44dd7b7ac (patch) | |
tree | a3afccd9a37304276ea76525ba38fd76da1678d2 /core/java | |
parent | 0fc59cd958b87d015deac63797fcbfbcec518389 (diff) | |
parent | a24bec32bdce3d8de6f722c91ba2a75628f5ba8c (diff) | |
download | frameworks_base-95e3cba1f66af5594b5bdc210426ced44dd7b7ac.zip frameworks_base-95e3cba1f66af5594b5bdc210426ced44dd7b7ac.tar.gz frameworks_base-95e3cba1f66af5594b5bdc210426ced44dd7b7ac.tar.bz2 |
Merge "Reconnect/teardown proxy network connectivity." into klp-modular-dev
Diffstat (limited to 'core/java')
-rw-r--r-- | core/java/android/net/ProxyDataTracker.java | 110 |
1 files changed, 96 insertions, 14 deletions
diff --git a/core/java/android/net/ProxyDataTracker.java b/core/java/android/net/ProxyDataTracker.java index a7d287b..461e8b8 100644 --- a/core/java/android/net/ProxyDataTracker.java +++ b/core/java/android/net/ProxyDataTracker.java @@ -16,13 +16,24 @@ package android.net; +import android.content.BroadcastReceiver; +import android.content.ComponentName; import android.content.Context; +import android.content.Intent; +import android.content.IntentFilter; +import android.content.ServiceConnection; +import android.os.Bundle; import android.os.Handler; +import android.os.IBinder; import android.os.Message; +import android.os.Messenger; +import android.os.RemoteException; +import android.os.UserHandle; import android.util.Log; import java.net.InetAddress; import java.net.UnknownHostException; +import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; /** @@ -31,27 +42,70 @@ import java.util.concurrent.atomic.AtomicInteger; * {@hide} */ public class ProxyDataTracker extends BaseNetworkStateTracker { - private static final String NETWORK_TYPE = "PROXY"; private static final String TAG = "ProxyDataTracker"; + private static final String NETWORK_TYPE = "PROXY"; // TODO: investigate how to get these DNS addresses from the system. private static final String DNS1 = "8.8.8.8"; private static final String DNS2 = "8.8.4.4"; private static final String REASON_ENABLED = "enabled"; + private static final String REASON_DISABLED = "disabled"; + private static final String REASON_PROXY_DOWN = "proxy_down"; + + private static final int MSG_TEAR_DOWN_REQUEST = 1; + private static final int MSG_SETUP_REQUEST = 2; + private static final String PERMISSION_PROXY_STATUS_SENDER = + "android.permission.ACCESS_NETWORK_CONDITIONS"; + private static final String ACTION_PROXY_STATUS_CHANGE = + "com.android.net.PROXY_STATUS_CHANGE"; + private static final String KEY_IS_PROXY_AVAILABLE = "is_proxy_available"; + private static final String KEY_REPLY_TO_MESSENGER_BINDER = "reply_to_messenger_binder"; + private static final String KEY_REPLY_TO_MESSENGER_BINDER_BUNDLE = + "reply_to_messenger_binder_bundle"; + + private Handler mTarget; + private Messenger mProxyStatusService; + private AtomicBoolean mReconnectRequested = new AtomicBoolean(false); + private AtomicBoolean mIsProxyAvailable = new AtomicBoolean(false); private final AtomicInteger mDefaultGatewayAddr = new AtomicInteger(0); - private final AtomicInteger mReconnectGeneration = new AtomicInteger(0); + + private final BroadcastReceiver mProxyStatusServiceListener = new BroadcastReceiver() { + @Override + public void onReceive(Context context, Intent intent) { + if (intent.getAction().equals(ACTION_PROXY_STATUS_CHANGE)) { + mIsProxyAvailable.set(intent.getBooleanExtra(KEY_IS_PROXY_AVAILABLE, false)); + if (mIsProxyAvailable.get()) { + Bundle bundle = intent.getBundleExtra(KEY_REPLY_TO_MESSENGER_BINDER_BUNDLE); + if (bundle == null || bundle.getBinder(KEY_REPLY_TO_MESSENGER_BINDER) == null) { + Log.e(TAG, "no messenger binder in the intent to send future requests"); + mIsProxyAvailable.set(false); + return; + } + mProxyStatusService = + new Messenger(bundle.getBinder(KEY_REPLY_TO_MESSENGER_BINDER)); + // If there is a pending reconnect request, do it now. + if (mReconnectRequested.get()) { + reconnect(); + } + } else { + setDetailedState(NetworkInfo.DetailedState.DISCONNECTED, + REASON_PROXY_DOWN, null); + } + } else { + Log.d(TAG, "Unrecognized broadcast intent"); + } + } + }; /** * Create a new ProxyDataTracker */ public ProxyDataTracker() { mNetworkInfo = new NetworkInfo(ConnectivityManager.TYPE_PROXY, 0, NETWORK_TYPE, ""); - // TODO: update available state according to proxy state. - mNetworkInfo.setIsAvailable(true); mLinkProperties = new LinkProperties(); mLinkCapabilities = new LinkCapabilities(); - + mNetworkInfo.setIsAvailable(true); try { mLinkProperties.addDns(InetAddress.getByName(DNS1)); mLinkProperties.addDns(InetAddress.getByName(DNS2)); @@ -64,11 +118,31 @@ public class ProxyDataTracker extends BaseNetworkStateTracker { throw new CloneNotSupportedException(); } + @Override + public void startMonitoring(Context context, Handler target) { + mContext = context; + mTarget = target; + mContext.registerReceiver(mProxyStatusServiceListener, + new IntentFilter(ACTION_PROXY_STATUS_CHANGE), + PERMISSION_PROXY_STATUS_SENDER, + null); + } + /** * Disable connectivity to the network. */ public boolean teardown() { - // TODO: tell relevant service to tear down proxy. + setTeardownRequested(true); + mReconnectRequested.set(false); + try { + if (mIsProxyAvailable.get() && mProxyStatusService != null) { + mProxyStatusService.send(Message.obtain(null, MSG_TEAR_DOWN_REQUEST)); + } + } catch (RemoteException e) { + Log.e(TAG, "Unable to connect to proxy status service", e); + return false; + } + setDetailedState(NetworkInfo.DetailedState.DISCONNECTED, REASON_DISABLED, null); return true; } @@ -76,16 +150,24 @@ public class ProxyDataTracker extends BaseNetworkStateTracker { * Re-enable proxy data connectivity after a {@link #teardown()}. */ public boolean reconnect() { - if (!isAvailable()) { - Log.w(TAG, "Reconnect requested even though network is disabled. Bailing."); + mReconnectRequested.set(true); + setTeardownRequested(false); + if (!mIsProxyAvailable.get()) { + Log.w(TAG, "Reconnect requested even though proxy service is not up. Bailing."); return false; } - setTeardownRequested(false); - mReconnectGeneration.incrementAndGet(); - // TODO: tell relevant service to setup proxy. Set state to connected only if setup - // succeeds. - setDetailedState(NetworkInfo.DetailedState.CONNECTED, REASON_ENABLED, null); + setDetailedState(NetworkInfo.DetailedState.CONNECTING, REASON_ENABLED, null); + try { + mProxyStatusService.send(Message.obtain(null, MSG_SETUP_REQUEST)); + } catch (RemoteException e) { + Log.e(TAG, "Unable to connect to proxy status service", e); + setDetailedState(NetworkInfo.DetailedState.DISCONNECTED, REASON_PROXY_DOWN, null); + return false; + } + // We'll assume proxy is set up successfully. If not, a status change broadcast will be + // received afterwards to indicate any failure. + setDetailedState(NetworkInfo.DetailedState.CONNECTED, REASON_ENABLED, null); return true; } @@ -116,7 +198,7 @@ public class ProxyDataTracker extends BaseNetworkStateTracker { private void setDetailedState(NetworkInfo.DetailedState state, String reason, String extraInfo) { mNetworkInfo.setDetailedState(state, reason, extraInfo); - Message msg = getTargetHandler().obtainMessage(EVENT_STATE_CHANGED, mNetworkInfo); + Message msg = mTarget.obtainMessage(EVENT_STATE_CHANGED, mNetworkInfo); msg.sendToTarget(); } } |