Merge "tethering: Tolerate socket exception from ifindex look-up" into ics (5f30cf46) · Commits · e / os / android_frameworks_base

services/java/com/android/server/NetworkManagementService.java

+7 −5

Original line number	Diff line number	Diff line
		@@ -850,12 +850,14 @@ public class NetworkManagementService extends INetworkManagementService.Stub
		}
		}

		private void modifyNat(String cmd, String internalInterface, String externalInterface)
		throws SocketException {
		private void modifyNat(String cmd, String internalInterface, String externalInterface) {
		cmd = String.format("nat %s %s %s", cmd, internalInterface, externalInterface);

		NetworkInterface internalNetworkInterface =
		NetworkInterface.getByName(internalInterface);
		NetworkInterface internalNetworkInterface = null;
		try {
		internalNetworkInterface = NetworkInterface.getByName(internalInterface);
		} catch (SocketException e) {
		Log.e(TAG, "failed to get ifindex. continuing.");
		}
		if (internalNetworkInterface == null) {
		cmd += " 0";
		} else {