Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fdc4ae6b authored Jul 24, 2010 by Steve Kondik

HACK - workaround for apps that NPE when getting wimax network info.

Since Wimax isn't supported yet, we need to keep userspace happy on the
Evo when bad assumptions are made.

parent 91bbd34b

core/java/android/net/ConnectivityManager.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -219,7 +219,8 @@ public class ConnectivityManager
		private IConnectivityManager mService;

		static public boolean isNetworkTypeValid(int networkType) {
		return networkType >= 0 && networkType <= MAX_NETWORK_TYPE;
		// HACK! Accept TYPE_WIMAX even though we don't support it yet
		return TYPE_WIMAX == networkType \|\| (networkType >= 0 && networkType <= MAX_NETWORK_TYPE);
		}

		public void setNetworkPreference(int preference) {

core/java/android/net/NetworkInfo.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -373,4 +373,13 @@ public class NetworkInfo implements Parcelable {
		return new NetworkInfo[size];
		}
		};

		/**
		* HACK! Get an empty NetworkInfo object for WIMAX stub
		* @hide
		*/
		public static final NetworkInfo getEmptyWimaxNetworkInfo() {
		return new NetworkInfo(ConnectivityManager.TYPE_WIMAX, 0, "", "");
		}

		}

services/java/com/android/server/ConnectivityService.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -507,6 +507,12 @@ public class ConnectivityService extends IConnectivityManager.Stub {

		public NetworkInfo getNetworkInfo(int networkType) {
		enforceAccessPermission();

		// HACK! - return a stub NetworkInfo object to make bad apps happy.
		if (ConnectivityManager.TYPE_WIMAX == networkType) {
		return NetworkInfo.getEmptyWimaxNetworkInfo();
		}

		if (ConnectivityManager.isNetworkTypeValid(networkType)) {
		NetworkStateTracker t = mNetTrackers[networkType];
		if (t != null)