Merge "Update NattKeepalive Error Codes to Match SocketKeepalive" am: 98d23b2a54 am: ec41f92f34 (a3d817cf) · Commits · e / os / android_frameworks_opt_telephony

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

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -2445,7 +2445,7 @@ public class DataConnection extends StateMachine {
	DataConnection.this.obtainMessage(EVENT_KEEPALIVE_START_REQUEST,		DataConnection.this.obtainMessage(EVENT_KEEPALIVE_START_REQUEST,
	msg.arg1, msg.arg2, msg.obj).sendToTarget();		msg.arg1, msg.arg2, msg.obj).sendToTarget();
	} else {		} 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:		case KeepaliveStatus.ERROR_NONE:
	return SocketKeepalive.SUCCESS;		return SocketKeepalive.SUCCESS;
	case KeepaliveStatus.ERROR_UNSUPPORTED:		case KeepaliveStatus.ERROR_UNSUPPORTED:
	return SocketKeepalive.ERROR_HARDWARE_UNSUPPORTED;		return SocketKeepalive.ERROR_UNSUPPORTED;
	case KeepaliveStatus.ERROR_NO_RESOURCES:		case KeepaliveStatus.ERROR_NO_RESOURCES:
			return SocketKeepalive.ERROR_INSUFFICIENT_RESOURCES;
	case KeepaliveStatus.ERROR_UNKNOWN:		case KeepaliveStatus.ERROR_UNKNOWN:
	default:		default:
	return SocketKeepalive.ERROR_HARDWARE_ERROR;		return SocketKeepalive.ERROR_HARDWARE_ERROR;