Merge tag 'android-4.3_r3.1' of... (a5f0c085) · Commits · e / os / android_frameworks_base

core/java/android/bluetooth/BluetoothTetheringDataTracker.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -152,6 +152,11 @@ public class BluetoothTetheringDataTracker implements NetworkStateTracker {
		// not implemented
		}

		@Override
		public void captivePortalCheckCompleted(boolean isCaptivePortal) {
		// not implemented
		}

		/**
		* Re-enable connectivity to a network after a {@link #teardown()}.
		*/

core/java/android/net/BaseNetworkStateTracker.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -101,6 +101,11 @@ public abstract class BaseNetworkStateTracker implements NetworkStateTracker {
		// not implemented
		}

		@Override
		public void captivePortalCheckCompleted(boolean isCaptivePortal) {
		// not implemented
		}

		@Override
		public boolean setRadio(boolean turnOn) {
		// Base tracker doesn't handle radios

core/java/android/net/CaptivePortalTracker.java

+45 −70

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@ import android.os.Message;
		import android.os.RemoteException;
		import android.provider.Settings;
		import android.telephony.TelephonyManager;
		import android.text.TextUtils;

		import com.android.internal.util.State;
		import com.android.internal.util.StateMachine;
		@@ -42,6 +43,7 @@ import java.io.IOException;
		import java.net.HttpURLConnection;
		import java.net.InetAddress;
		import java.net.Inet4Address;
		import java.net.SocketTimeoutException;
		import java.net.URL;
		import java.net.UnknownHostException;

		@@ -52,17 +54,15 @@ import com.android.internal.R;
		* @hide
		*/
		public class CaptivePortalTracker extends StateMachine {
		private static final boolean DBG = false;
		private static final boolean DBG = true;
		private static final String TAG = "CaptivePortalTracker";

		private static final String DEFAULT_SERVER = "clients3.google.com";
		private static final String NOTIFICATION_ID = "CaptivePortal.Notification";

		private static final int SOCKET_TIMEOUT_MS = 10000;

		private String mServer;
		private String mUrl;
		private boolean mNotificationShown = false;
		private boolean mIsCaptivePortalCheckEnabled = false;
		private IConnectivityManager mConnService;
		private TelephonyManager mTelephonyManager;
		@@ -159,12 +159,12 @@ public class CaptivePortalTracker extends StateMachine {
		private class DefaultState extends State {
		@Override
		public void enter() {
		if (DBG) log(getName() + "\n");
		setNotificationOff();
		}

		@Override
		public boolean processMessage(Message message) {
		if (DBG) log(getName() + message.toString() + "\n");
		if (DBG) log(getName() + message.toString());
		switch (message.what) {
		case CMD_DETECT_PORTAL:
		NetworkInfo info = (NetworkInfo) message.obj;
		@@ -186,24 +186,25 @@ public class CaptivePortalTracker extends StateMachine {
		private class NoActiveNetworkState extends State {
		@Override
		public void enter() {
		if (DBG) log(getName() + "\n");
		mNetworkInfo = null;
		/* Clear any previous notification */
		setNotificationVisible(false);
		}

		@Override
		public boolean processMessage(Message message) {
		if (DBG) log(getName() + message.toString() + "\n");
		if (DBG) log(getName() + message.toString());
		InetAddress server;
		NetworkInfo info;
		switch (message.what) {
		case CMD_CONNECTIVITY_CHANGE:
		info = (NetworkInfo) message.obj;
		if (info.getType() == ConnectivityManager.TYPE_WIFI) {
		if (info.isConnected() && isActiveNetwork(info)) {
		mNetworkInfo = info;
		transitionTo(mDelayedCaptiveCheckState);
		}
		} else {
		log(getName() + " not a wifi connectivity change, ignore");
		}
		break;
		default:
		return NOT_HANDLED;
		@@ -215,7 +216,7 @@ public class CaptivePortalTracker extends StateMachine {
		private class ActiveNetworkState extends State {
		@Override
		public void enter() {
		if (DBG) log(getName() + "\n");
		setNotificationOff();
		}

		@Override
		@@ -248,7 +249,6 @@ public class CaptivePortalTracker extends StateMachine {
		private class DelayedCaptiveCheckState extends State {
		@Override
		public void enter() {
		if (DBG) log(getName() + "\n");
		Message message = obtainMessage(CMD_DELAYED_CAPTIVE_CHECK, ++mDelayedCheckToken, 0);
		if (mDeviceProvisioned) {
		sendMessageDelayed(message, DELAYED_CHECK_INTERVAL_MS);
		@@ -259,7 +259,7 @@ public class CaptivePortalTracker extends StateMachine {

		@Override
		public boolean processMessage(Message message) {
		if (DBG) log(getName() + message.toString() + "\n");
		if (DBG) log(getName() + message.toString());
		switch (message.what) {
		case CMD_DELAYED_CAPTIVE_CHECK:
		if (message.arg1 == mDelayedCheckToken) {
		@@ -270,11 +270,17 @@ public class CaptivePortalTracker extends StateMachine {
		} else {
		if (DBG) log("Not captive network " + mNetworkInfo);
		}
		notifyPortalCheckCompleted(mNetworkInfo, captive);
		if (mDeviceProvisioned) {
		if (captive) {
		// Setup Wizard will assist the user in connecting to a captive
		// portal, so make the notification visible unless during setup
		setNotificationVisible(true);
		try {
		mConnService.setProvisioningNotificationVisible(true,
		mNetworkInfo.getType(), mNetworkInfo.getExtraInfo(), mUrl);
		} catch(RemoteException e) {
		e.printStackTrace();
		}
		}
		} else {
		Intent intent = new Intent(
		@@ -300,12 +306,26 @@ public class CaptivePortalTracker extends StateMachine {
		return;
		}
		try {
		if (DBG) log("notifyPortalCheckComplete: ni=" + info);
		mConnService.captivePortalCheckComplete(info);
		} catch(RemoteException e) {
		e.printStackTrace();
		}
		}

		private void notifyPortalCheckCompleted(NetworkInfo info, boolean isCaptivePortal) {
		if (info == null) {
		loge("notifyPortalCheckComplete on null");
		return;
		}
		try {
		if (DBG) log("notifyPortalCheckCompleted: captive=" + isCaptivePortal + " ni=" + info);
		mConnService.captivePortalCheckCompleted(info, isCaptivePortal);
		} catch(RemoteException e) {
		e.printStackTrace();
		}
		}

		private boolean isActiveNetwork(NetworkInfo info) {
		try {
		NetworkInfo active = mConnService.getActiveNetworkInfo();
		@@ -318,6 +338,15 @@ public class CaptivePortalTracker extends StateMachine {
		return false;
		}

		private void setNotificationOff() {
		try {
		mConnService.setProvisioningNotificationVisible(false, ConnectivityManager.TYPE_NONE,
		null, null);
		} catch (RemoteException e) {
		log("setNotificationOff: " + e);
		}
		}

		/**
		* Do a URL fetch on a known server to see if we get the data we expect
		*/
		@@ -360,58 +389,4 @@ public class CaptivePortalTracker extends StateMachine {
		}
		return null;
		}

		private void setNotificationVisible(boolean visible) {
		// if it should be hidden and it is already hidden, then noop
		if (!visible && !mNotificationShown) {
		return;
		}

		Resources r = Resources.getSystem();
		NotificationManager notificationManager = (NotificationManager) mContext
		.getSystemService(Context.NOTIFICATION_SERVICE);

		if (visible) {
		CharSequence title;
		CharSequence details;
		int icon;
		switch (mNetworkInfo.getType()) {
		case ConnectivityManager.TYPE_WIFI:
		title = r.getString(R.string.wifi_available_sign_in, 0);
		details = r.getString(R.string.network_available_sign_in_detailed,
		mNetworkInfo.getExtraInfo());
		icon = R.drawable.stat_notify_wifi_in_range;
		break;
		case ConnectivityManager.TYPE_MOBILE:
		title = r.getString(R.string.network_available_sign_in, 0);
		// TODO: Change this to pull from NetworkInfo once a printable
		// name has been added to it
		details = mTelephonyManager.getNetworkOperatorName();
		icon = R.drawable.stat_notify_rssi_in_range;
		break;
		default:
		title = r.getString(R.string.network_available_sign_in, 0);
		details = r.getString(R.string.network_available_sign_in_detailed,
		mNetworkInfo.getExtraInfo());
		icon = R.drawable.stat_notify_rssi_in_range;
		break;
		}

		Notification notification = new Notification();
		notification.when = 0;
		notification.icon = icon;
		notification.flags = Notification.FLAG_AUTO_CANCEL;
		Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(mUrl));
		intent.setFlags(Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT \|
		Intent.FLAG_ACTIVITY_NEW_TASK);
		notification.contentIntent = PendingIntent.getActivity(mContext, 0, intent, 0);
		notification.tickerText = title;
		notification.setLatestEventInfo(mContext, title, details, notification.contentIntent);

		notificationManager.notify(NOTIFICATION_ID, 1, notification);
		} else {
		notificationManager.cancel(NOTIFICATION_ID, 1);
		}
		mNotificationShown = visible;
		}
		}

core/java/android/net/ConnectivityManager.java

+79 −41

Original line number	Diff line number	Diff line
		@@ -582,6 +582,29 @@ public class ConnectivityManager {
		}
		}

		/**
		* Returns details about the Provisioning or currently active default data network. When
		* connected, this network is the default route for outgoing connections.
		* You should always check {@link NetworkInfo#isConnected()} before initiating
		* network traffic. This may return {@code null} when there is no default
		* network.
		*
		* @return a {@link NetworkInfo} object for the current default network
		* or {@code null} if no network default network is currently active
		*
		* <p>This method requires the call to hold the permission
		* {@link android.Manifest.permission#ACCESS_NETWORK_STATE}.
		*
		* {@hide}
		*/
		public NetworkInfo getProvisioningOrActiveNetworkInfo() {
		try {
		return mService.getProvisioningOrActiveNetworkInfo();
		} catch (RemoteException e) {
		return null;
		}
		}

		/**
		* Returns the IP information for the current default network.
		*
		@@ -1282,6 +1305,25 @@ public class ConnectivityManager {
		}
		}

		/**
		* Signal that the captive portal check on the indicated network
		* is complete and whether its a captive portal or not.
		*
		* @param info the {@link NetworkInfo} object for the networkType
		* in question.
		* @param isCaptivePortal true/false.
		*
		* <p>This method requires the call to hold the permission
		* {@link android.Manifest.permission#CONNECTIVITY_INTERNAL}.
		* {@hide}
		*/
		public void captivePortalCheckCompleted(NetworkInfo info, boolean isCaptivePortal) {
		try {
		mService.captivePortalCheckCompleted(info, isCaptivePortal);
		} catch (RemoteException e) {
		}
		}

		/**
		* Supply the backend messenger for a network tracker
		*
		@@ -1297,66 +1339,62 @@ public class ConnectivityManager {
		}

		/**
		* The ResultReceiver resultCode for checkMobileProvisioning (CMP_RESULT_CODE)
		*/

		/**
		* No connection was possible to the network.
		* {@hide}
		*/
		public static final int CMP_RESULT_CODE_NO_CONNECTION = 0;

		/**
		* A connection was made to the internet, all is well.
		* {@hide}
		*/
		public static final int CMP_RESULT_CODE_CONNECTABLE = 1;

		/**
		* A connection was made but there was a redirection, we appear to be in walled garden.
		* This is an indication of a warm sim on a mobile network.
		* Check mobile provisioning.
		*
		* @param suggestedTimeOutMs, timeout in milliseconds
		*
		* @return time out that will be used, maybe less that suggestedTimeOutMs
		* -1 if an error.
		*
		* {@hide}
		*/
		public static final int CMP_RESULT_CODE_REDIRECTED = 2;
		public int checkMobileProvisioning(int suggestedTimeOutMs) {
		int timeOutMs = -1;
		try {
		timeOutMs = mService.checkMobileProvisioning(suggestedTimeOutMs);
		} catch (RemoteException e) {
		}
		return timeOutMs;
		}

		/**
		* A connection was made but no dns server was available to resolve a name to address.
		* This is an indication of a warm sim on a mobile network.
		*
		* Get the mobile provisioning url.
		* {@hide}
		*/
		public static final int CMP_RESULT_CODE_NO_DNS = 3;
		public String getMobileProvisioningUrl() {
		try {
		return mService.getMobileProvisioningUrl();
		} catch (RemoteException e) {
		}
		return null;
		}

		/**
		* A connection was made but could not open a TCP connection.
		* This is an indication of a warm sim on a mobile network.
		* Get the mobile redirected provisioning url.
		* {@hide}
		*/
		public static final int CMP_RESULT_CODE_NO_TCP_CONNECTION = 4;
		public String getMobileRedirectedProvisioningUrl() {
		try {
		return mService.getMobileRedirectedProvisioningUrl();
		} catch (RemoteException e) {
		}
		return null;
		}

		/**
		* Check mobile provisioning. The resultCode passed to
		* onReceiveResult will be one of the CMP_RESULT_CODE_xxxx values above.
		* This may take a minute or more to complete.
		* Set sign in error notification to visible or in visible
		*
		* @param sendNotificaiton, when true a notification will be sent to user.
		* @param suggestedTimeOutMs, timeout in milliseconds
		* @param resultReceiver needs to be supplied to receive the result
		*
		* @return time out that will be used, maybe less that suggestedTimeOutMs
		* -1 if an error.
		* @param visible
		* @param networkType
		*
		* {@hide}
		*/
		public int checkMobileProvisioning(boolean sendNotification, int suggestedTimeOutMs,
		ResultReceiver resultReceiver) {
		int timeOutMs = -1;
		public void setProvisioningNotificationVisible(boolean visible, int networkType,
		String extraInfo, String url) {
		try {
		timeOutMs = mService.checkMobileProvisioning(sendNotification, suggestedTimeOutMs,
		resultReceiver);
		mService.setProvisioningNotificationVisible(visible, networkType, extraInfo, url);
		} catch (RemoteException e) {
		}
		return timeOutMs;
		}

		/**

core/java/android/net/DummyDataStateTracker.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -120,10 +120,16 @@ public class DummyDataStateTracker implements NetworkStateTracker {
		return true;
		}

		@Override
		public void captivePortalCheckComplete() {
		// not implemented
		}

		@Override
		public void captivePortalCheckCompleted(boolean isCaptivePortal) {
		// not implemented
		}

		/**
		* Record the detailed state of a network, and if it is a
		* change from the previous state, send a notification to