Merge pull request android-async-http#46 from BearTung/master

timeout param type is wrong

Author: loopj

src/com/loopj/android/http/AsyncHttpClient.java

@@ -58,6 +58,7 @@
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager;
 import org.apache.http.params.BasicHttpParams;
+import org.apache.http.params.HttpParams;
 import org.apache.http.params.HttpConnectionParams;
 import org.apache.http.params.HttpProtocolParams;
 import org.apache.http.protocol.BasicHttpContext;
@@ -205,7 +206,7 @@ public void setUserAgent(String userAgent) {
      * @param timeout the connect/socket timeout in milliseconds
      */
     public void setTimeout(int timeout){
-        final BasicHttpParams httpParams = this.httpClient.getParams();
+        final HttpParams httpParams = this.httpClient.getParams();
         ConnManagerParams.setTimeout(httpParams, timeout);
         HttpConnectionParams.setSoTimeout(httpParams, timeout);
         HttpConnectionParams.setConnectionTimeout(httpParams, timeout);