Merge "Proactively disable data when over policy limit." (006efb24) · Commits · e / os / android_frameworks_base

core/java/android/bluetooth/BluetoothTetheringDataTracker.java

+8 −7

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@ package android.bluetooth;
		import android.content.Context;
		import android.net.ConnectivityManager;
		import android.net.DhcpInfoInternal;
		import android.net.LinkAddress;
		import android.net.LinkCapabilities;
		import android.net.LinkProperties;
		import android.net.NetworkInfo;
		@@ -30,7 +29,6 @@ import android.os.Handler;
		import android.os.Message;
		import android.util.Log;

		import java.net.InetAddress;
		import java.util.concurrent.atomic.AtomicBoolean;
		import java.util.concurrent.atomic.AtomicInteger;

		@@ -184,11 +182,14 @@ public class BluetoothTetheringDataTracker implements NetworkStateTracker {
		return -1;
		}

		/**
		* @param enabled
		*/
		public void setDataEnable(boolean enabled) {
		android.util.Log.d(TAG, "setDataEnabled: IGNORING enabled=" + enabled);
		@Override
		public void setUserDataEnable(boolean enabled) {
		Log.w(TAG, "ignoring setUserDataEnable(" + enabled + ")");
		}

		@Override
		public void setPolicyDataEnable(boolean enabled) {
		Log.w(TAG, "ignoring setPolicyDataEnable(" + enabled + ")");
		}

		/**

core/java/android/net/DummyDataStateTracker.java

+8 −4

Original line number	Diff line number	Diff line
		@@ -19,9 +19,6 @@ package android.net;
		import android.content.Context;
		import android.os.Handler;
		import android.os.Message;
		import android.net.NetworkInfo.DetailedState;
		import android.net.NetworkInfo;
		import android.net.LinkProperties;
		import android.util.Slog;

		/**
		@@ -168,7 +165,14 @@ public class DummyDataStateTracker implements NetworkStateTracker {
		return true;
		}

		public void setDataEnable(boolean enabled) {
		@Override
		public void setUserDataEnable(boolean enabled) {
		// ignored
		}

		@Override
		public void setPolicyDataEnable(boolean enabled) {
		// ignored
		}

		@Override

core/java/android/net/EthernetDataTracker.java

+8 −14

Original line number	Diff line number	Diff line
		@@ -17,15 +17,7 @@
		package android.net;

		import android.content.Context;
		import android.net.ConnectivityManager;
		import android.net.DhcpInfoInternal;
		import android.net.LinkAddress;
		import android.net.LinkCapabilities;
		import android.net.LinkProperties;
		import android.net.NetworkInfo;
		import android.net.NetworkInfo.DetailedState;
		import android.net.NetworkStateTracker;
		import android.net.NetworkUtils;
		import android.os.Handler;
		import android.os.IBinder;
		import android.os.INetworkManagementService;
		@@ -34,7 +26,6 @@ import android.os.RemoteException;
		import android.os.ServiceManager;
		import android.util.Log;

		import java.net.InetAddress;
		import java.util.concurrent.atomic.AtomicBoolean;
		import java.util.concurrent.atomic.AtomicInteger;

		@@ -302,11 +293,14 @@ public class EthernetDataTracker implements NetworkStateTracker {
		return -1;
		}

		/**
		* @param enabled
		*/
		public void setDataEnable(boolean enabled) {
		Log.d(TAG, "setDataEnabled: IGNORING enabled=" + enabled);
		@Override
		public void setUserDataEnable(boolean enabled) {
		Log.w(TAG, "ignoring setUserDataEnable(" + enabled + ")");
		}

		@Override
		public void setPolicyDataEnable(boolean enabled) {
		Log.w(TAG, "ignoring setPolicyDataEnable(" + enabled + ")");
		}

		/**

core/java/android/net/IConnectivityManager.aidl

+3 −1

Original line number	Diff line number	Diff line
		@@ -64,9 +64,11 @@ interface IConnectivityManager
		boolean requestRouteToHostAddress(int networkType, in byte[] hostAddress);

		boolean getMobileDataEnabled();

		void setMobileDataEnabled(boolean enabled);

		/** Policy control over specific {@link NetworkStateTracker}. */
		void setPolicyDataEnable(int networkType, boolean enabled);

		int tether(String iface);

		int untether(String iface);

core/java/android/net/MobileDataStateTracker.java

+27 −22

Original line number	Diff line number	Diff line
		@@ -16,19 +16,26 @@

		package android.net;

		import static com.android.internal.telephony.DataConnectionTracker.CMD_SET_POLICY_DATA_ENABLE;
		import static com.android.internal.telephony.DataConnectionTracker.CMD_SET_USER_DATA_ENABLE;
		import static com.android.internal.telephony.DataConnectionTracker.DISABLED;
		import static com.android.internal.telephony.DataConnectionTracker.ENABLED;

		import android.content.BroadcastReceiver;
		import android.content.Context;
		import android.content.Intent;
		import android.content.IntentFilter;
		import android.net.NetworkInfo.DetailedState;
		import android.os.Bundle;
		import android.os.HandlerThread;
		import android.os.Handler;
		import android.os.Looper;
		import android.os.Message;
		import android.os.Messenger;
		import android.os.RemoteException;
		import android.os.Handler;
		import android.os.IBinder;
		import android.os.Message;
		import android.os.ServiceManager;
		import android.telephony.TelephonyManager;
		import android.text.TextUtils;
		import android.util.Slog;

		import com.android.internal.telephony.DataConnectionTracker;
		import com.android.internal.telephony.ITelephony;
		@@ -36,13 +43,6 @@ import com.android.internal.telephony.Phone;
		import com.android.internal.telephony.TelephonyIntents;
		import com.android.internal.util.AsyncChannel;

		import android.net.NetworkInfo.DetailedState;
		import android.net.NetworkInfo;
		import android.net.LinkProperties;
		import android.telephony.TelephonyManager;
		import android.util.Slog;
		import android.text.TextUtils;

		/**
		* Track the state of mobile data connectivity. This is done by
		* receiving broadcast intents from the Phone process whenever
		@@ -452,17 +452,22 @@ public class MobileDataStateTracker implements NetworkStateTracker {
		return false;
		}

		/**
		* @param enabled
		*/
		public void setDataEnable(boolean enabled) {
		try {
		if (DBG) log("setDataEnable: E enabled=" + enabled);
		mDataConnectionTrackerAc.sendMessage(DataConnectionTracker.CMD_SET_DATA_ENABLE,
		enabled ? DataConnectionTracker.ENABLED : DataConnectionTracker.DISABLED);
		if (VDBG) log("setDataEnable: X enabled=" + enabled);
		} catch (Exception e) {
		loge("setDataEnable: X mAc was null" + e);
		@Override
		public void setUserDataEnable(boolean enabled) {
		if (DBG) log("setUserDataEnable: E enabled=" + enabled);
		final AsyncChannel channel = mDataConnectionTrackerAc;
		if (channel != null) {
		channel.sendMessage(CMD_SET_USER_DATA_ENABLE, enabled ? ENABLED : DISABLED);
		}
		if (VDBG) log("setUserDataEnable: X enabled=" + enabled);
		}

		@Override
		public void setPolicyDataEnable(boolean enabled) {
		if (DBG) log("setPolicyDataEnable(enabled=" + enabled + ")");
		final AsyncChannel channel = mDataConnectionTrackerAc;
		if (channel != null) {
		channel.sendMessage(CMD_SET_POLICY_DATA_ENABLE, enabled ? ENABLED : DISABLED);
		}
		}