wimax: Remove CM WiMAX support in favor of Google's (a26ff2cb) · Commits · e / os / android_frameworks_base

api/current.xml

+0 −99

Original line number	Diff line number	Diff line
		@@ -122,17 +122,6 @@
		visibility="public"
		>
		</field>
		<field name="ACCESS_WIMAX_STATE"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.permission.ACCESS_WIMAX_STATE""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="ACCOUNT_MANAGER"
		type="java.lang.String"
		transient="false"
		@@ -375,17 +364,6 @@
		visibility="public"
		>
		</field>
		<field name="CHANGE_WIMAX_STATE"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.permission.CHANGE_WIMAX_STATE""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="CLEAR_APP_CACHE"
		type="java.lang.String"
		transient="false"
		@@ -36224,17 +36202,6 @@
		visibility="public"
		>
		</field>
		<field name="WIMAX_SERVICE"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""wimax""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="WINDOW_SERVICE"
		type="java.lang.String"
		transient="false"
		@@ -94664,17 +94631,6 @@
		visibility="public"
		>
		</field>
		<field name="TYPE_MOBILE_WIMAX"
		type="int"
		transient="false"
		volatile="false"
		value="6"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="TYPE_WIFI"
		type="int"
		transient="false"
		@@ -146544,17 +146500,6 @@
		visibility="public"
		>
		</field>
		<field name="ACTION_WIMAX_SETTINGS"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.settings.WIMAX_SETTINGS""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="ACTION_WIRELESS_SETTINGS"
		type="java.lang.String"
		transient="false"
		@@ -147503,39 +147448,6 @@
		visibility="public"
		>
		</field>
		<field name="WIMAX_AUTO_CONNECT_ON"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""wimax_auto_connect_on""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="WIMAX_LAST_CONNECTED_NETWORK"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""wimax_last_connected_network""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="WIMAX_ON"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""wimax_on""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		</class>
		<class name="Settings.SettingNotFoundException"
		extends="android.util.AndroidException"
		@@ -148308,17 +148220,6 @@
		visibility="public"
		>
		</field>
		<field name="RADIO_WIMAX"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""wimax""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="RINGTONE"
		type="java.lang.String"
		transient="false"

core/java/android/app/ContextImpl.java

+0 −36

Original line number	Diff line number	Diff line
		@@ -119,8 +119,6 @@ import java.io.FileOutputStream;
		import java.io.IOException;
		import java.io.InputStream;
		import java.lang.ref.WeakReference;
		import java.lang.reflect.Constructor;
		import java.lang.reflect.Method;
		import java.util.ArrayList;
		import java.util.HashMap;
		import java.util.HashSet;
		@@ -179,7 +177,6 @@ class ContextImpl extends Context {
		private static ConnectivityManager sConnectivityManager;
		private static ThrottleManager sThrottleManager;
		private static WifiManager sWifiManager;
		private static Object sWimaxController;
		private static LocationManager sLocationManager;
		private static final HashMap<String, SharedPreferencesImpl> sSharedPrefs =
		new HashMap<String, SharedPreferencesImpl>();
		@@ -966,8 +963,6 @@ class ContextImpl extends Context {
		return getThrottleManager();
		} else if (WIFI_SERVICE.equals(name)) {
		return getWifiManager();
		} else if (WIMAX_SERVICE.equals(name)) {
		return getWimaxController();
		} else if (NOTIFICATION_SERVICE.equals(name)) {
		return getNotificationManager();
		} else if (PROFILE_SERVICE.equals(name)) {
		@@ -1097,37 +1092,6 @@ class ContextImpl extends Context {
		return sWifiManager;
		}

		/*
		* Use reflection hacks to get an instance of the WimaxController
		*/
		private Object getWimaxController()
		{
		synchronized (sSync) {
		if (sWimaxController == null) {
		try {
		IBinder b = ServiceManager.getService(WIMAX_SERVICE);
		if (b != null) {
		Class<?> klass = Class.forName("com.htc.net.wimax.IWimaxController$Stub");
		if (klass != null) {
		Method asInterface = klass.getMethod("asInterface", IBinder.class);
		Object wc = asInterface.invoke(null, b);
		if (wc != null) {
		klass = Class.forName("com.htc.net.wimax.WimaxController");
		if (klass != null) {
		Constructor<?> ctor = klass.getDeclaredConstructors()[1];
		sWimaxController = ctor.newInstance(wc, mMainThread.getHandler());
		}
		}
		}
		}
		} catch (Exception e) {
		Log.e(TAG, "Unable to create WimaxController instance", e);
		}
		}
		}
		return sWimaxController;
		}

		private NotificationManager getNotificationManager() {
		synchronized (mSync) {
		if (mNotificationManager == null) {

core/java/android/bluetooth/BluetoothAdapter.java

+0 −9

Original line number	Diff line number	Diff line
		@@ -999,13 +999,4 @@ public final class BluetoothAdapter {
		}
		return true;
		}

		/**
		* For compatibility with proprietary code
		*
		* @hide
		*/
		public boolean setAFH(boolean paramBoolean, byte paramByte1, byte paramByte2) {
		return true;
		}
		}

core/java/android/content/Context.java

+0 −13

Original line number	Diff line number	Diff line
		@@ -1205,8 +1205,6 @@ public abstract class Context {
		* <dt> {@link #WIFI_SERVICE} ("wifi")
		* <dd> A {@link android.net.wifi.WifiManager WifiManager} for management of
		* Wi-Fi connectivity.
		* <dt> {@link #WIMAX_SERVICE} ("wimax")
		* <dd> A WimaxManager for management of Wimax connectivity.
		* <dt> {@link #INPUT_METHOD_SERVICE} ("input_method")
		* <dd> An {@link android.view.inputmethod.InputMethodManager InputMethodManager}
		* for management of input methods.
		@@ -1253,7 +1251,6 @@ public abstract class Context {
		* @see android.net.ConnectivityManager
		* @see #WIFI_SERVICE
		* @see android.net.wifi.WifiManager
		* @see #WIMAX_SERVICE
		* @see #AUDIO_SERVICE
		* @see android.media.AudioManager
		* @see #TELEPHONY_SERVICE
		@@ -1471,16 +1468,6 @@ public abstract class Context {
		*/
		public static final String WIFI_SERVICE = "wifi";

		/**
		* Use with {@link #getSystemService} to retrieve a WimaxManager
		* for handling management of
		* Wimax access.
		*
		* @see #getSystemService
		* @see android.net.wimax.WimaxManager
		*/
		public static final String WIMAX_SERVICE = "wimax";

		/**
		* Use with {@link #getSystemService} to retrieve a
		* {@link android.media.AudioManager} for handling management of volume,

core/java/android/content/SyncManager.java

+1 −13

Original line number	Diff line number	Diff line
		@@ -159,8 +159,6 @@ public class SyncManager implements OnAccountsUpdateListener {

		private final SyncAdaptersCache mSyncAdapters;

		private boolean mWimaxConnected = false;

		private BroadcastReceiver mStorageIntentReceiver =
		new BroadcastReceiver() {
		public void onReceive(Context context, Intent intent) {
		@@ -263,22 +261,12 @@ public class SyncManager implements OnAccountsUpdateListener {
		final boolean wasConnected = mDataConnectionIsConnected;
		switch (state) {
		case CONNECTED:
		if (networkInfo.getType() == ConnectivityManager.TYPE_WIMAX) {
		mWimaxConnected = true;
		}
		mDataConnectionIsConnected = true;
		break;
		case DISCONNECTED:
		if (networkInfo.getType() == ConnectivityManager.TYPE_WIMAX) {
		mWimaxConnected = false;
		}
		if (!mWimaxConnected && intent.getBooleanExtra(ConnectivityManager.EXTRA_NO_CONNECTIVITY, false)) {
		Log.v(TAG,"SyncManager::mConnectivityIntentReceiver.onReceive() "
		+ "- DISCONNECTED and no connectivity");
		if (intent.getBooleanExtra(ConnectivityManager.EXTRA_NO_CONNECTIVITY, false)) {
		mDataConnectionIsConnected = false;
		} else {
		Log.v(TAG, "SyncManager::mConnectivityIntentReceiver.onReceive() "
		+ "- DISCONNECTED but there is connectivity");
		mDataConnectionIsConnected = true;
		}
		break;