Merge "Tether: dont log as errors 'ignored' messages" into gingerbread (b8a891e9) · Commits · e / os / android_frameworks_base

services/java/com/android/server/connectivity/Tethering.java

+7 −7

Original line number	Diff line number	Diff line
		@@ -254,7 +254,7 @@ public class Tethering extends INetworkManagementEventObserver.Stub {
		synchronized (mIfaces) {
		TetherInterfaceSM sm = mIfaces.get(iface);
		if (sm != null) {
		Log.e(TAG, "active iface (" + iface + ") reported as added, ignoring");
		Log.w(TAG, "active iface (" + iface + ") reported as added, ignoring");
		return;
		}
		sm = new TetherInterfaceSM(iface, mLooper, usb);
		@@ -268,7 +268,7 @@ public class Tethering extends INetworkManagementEventObserver.Stub {
		synchronized (mIfaces) {
		TetherInterfaceSM sm = mIfaces.get(iface);
		if (sm == null) {
		Log.e(TAG, "attempting to remove unknown iface (" + iface + "), ignoring");
		Log.w(TAG, "attempting to remove unknown iface (" + iface + "), ignoring");
		return;
		}
		sm.sendMessage(TetherInterfaceSM.CMD_INTERFACE_DOWN);
		@@ -283,11 +283,11 @@ public class Tethering extends INetworkManagementEventObserver.Stub {
		sm = mIfaces.get(iface);
		}
		if (sm == null) {
		Log.e(TAG, "Tried to Tether an unknown iface :" + iface + ", ignoring");
		Log.w(TAG, "Tried to Tether an unknown iface :" + iface + ", ignoring");
		return ConnectivityManager.TETHER_ERROR_UNKNOWN_IFACE;
		}
		if (!sm.isAvailable() && !sm.isErrored()) {
		Log.e(TAG, "Tried to Tether an unavailable iface :" + iface + ", ignoring");
		Log.w(TAG, "Tried to Tether an unavailable iface :" + iface + ", ignoring");
		return ConnectivityManager.TETHER_ERROR_UNAVAIL_IFACE;
		}
		sm.sendMessage(TetherInterfaceSM.CMD_TETHER_REQUESTED);
		@@ -301,11 +301,11 @@ public class Tethering extends INetworkManagementEventObserver.Stub {
		sm = mIfaces.get(iface);
		}
		if (sm == null) {
		Log.e(TAG, "Tried to Untether an unknown iface :" + iface + ", ignoring");
		Log.w(TAG, "Tried to Untether an unknown iface :" + iface + ", ignoring");
		return ConnectivityManager.TETHER_ERROR_UNKNOWN_IFACE;
		}
		if (sm.isErrored()) {
		Log.e(TAG, "Tried to Untethered an errored iface :" + iface + ", ignoring");
		Log.w(TAG, "Tried to Untethered an errored iface :" + iface + ", ignoring");
		return ConnectivityManager.TETHER_ERROR_UNAVAIL_IFACE;
		}
		sm.sendMessage(TetherInterfaceSM.CMD_TETHER_UNREQUESTED);
		@@ -318,7 +318,7 @@ public class Tethering extends INetworkManagementEventObserver.Stub {
		sm = mIfaces.get(iface);
		}
		if (sm == null) {
		Log.e(TAG, "Tried to getLastTetherError on an unknown iface :" + iface + ", ignoring");
		Log.w(TAG, "Tried to getLastTetherError on an unknown iface :" + iface + ", ignoring");
		return ConnectivityManager.TETHER_ERROR_UNKNOWN_IFACE;
		}
		return sm.getLastError();