Merge "Update NattKeepalive Error Codes to Match SocketKeepalive" (98d23b2a) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/dataconnection/DataConnection.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -2445,7 +2445,7 @@ public class DataConnection extends StateMachine {
		DataConnection.this.obtainMessage(EVENT_KEEPALIVE_START_REQUEST,
		msg.arg1, msg.arg2, msg.obj).sendToTarget();
		} else {
		onSocketKeepaliveEvent(msg.arg1, SocketKeepalive.ERROR_HARDWARE_UNSUPPORTED);
		onSocketKeepaliveEvent(msg.arg1, SocketKeepalive.ERROR_UNSUPPORTED);
		}
		}

		@@ -2481,8 +2481,9 @@ public class DataConnection extends StateMachine {
		case KeepaliveStatus.ERROR_NONE:
		return SocketKeepalive.SUCCESS;
		case KeepaliveStatus.ERROR_UNSUPPORTED:
		return SocketKeepalive.ERROR_HARDWARE_UNSUPPORTED;
		return SocketKeepalive.ERROR_UNSUPPORTED;
		case KeepaliveStatus.ERROR_NO_RESOURCES:
		return SocketKeepalive.ERROR_INSUFFICIENT_RESOURCES;
		case KeepaliveStatus.ERROR_UNKNOWN:
		default:
		return SocketKeepalive.ERROR_HARDWARE_ERROR;