am ed2c9c60: am 10a36fb7: Merge "Stop using ErrorStrings for apache."

* commit 'ed2c9c6029b18df9c25d6c98c909ac5f300d6ab1':
  Stop using ErrorStrings for apache.

2 files changed, 56 insertions, 100 deletions

diff --git a/core/java/android/net/http/Connection.java b/core/java/android/net/http/Connection.java
index 834ad69..831bd0e 100644
--- a/core/java/android/net/http/Connection.java
+++ b/core/java/android/net/http/Connection.java
@@ -436,7 +436,7 @@ abstract class Connection {
             ret = false;
             String error;
             if (errorId < 0) {
-                error = ErrorStrings.getString(errorId, mContext);
+                error = getEventHandlerErrorString(errorId);
             } else {
                 Throwable cause = e.getCause();
                 error = cause != null ? cause.toString() : e.getMessage();
@@ -451,6 +451,61 @@ abstract class Connection {
         return ret;
     }
 
+    private static String getEventHandlerErrorString(int errorId) {
+        switch (errorId) {
+            case EventHandler.OK:
+                return "OK";
+
+            case EventHandler.ERROR:
+                return "ERROR";
+
+            case EventHandler.ERROR_LOOKUP:
+                return "ERROR_LOOKUP";
+
+            case EventHandler.ERROR_UNSUPPORTED_AUTH_SCHEME:
+                return "ERROR_UNSUPPORTED_AUTH_SCHEME";
+
+            case EventHandler.ERROR_AUTH:
+                return "ERROR_AUTH";
+
+            case EventHandler.ERROR_PROXYAUTH:
+                return "ERROR_PROXYAUTH";
+
+            case EventHandler.ERROR_CONNECT:
+                return "ERROR_CONNECT";
+
+            case EventHandler.ERROR_IO:
+                return "ERROR_IO";
+
+            case EventHandler.ERROR_TIMEOUT:
+                return "ERROR_TIMEOUT";
+
+            case EventHandler.ERROR_REDIRECT_LOOP:
+                return "ERROR_REDIRECT_LOOP";
+
+            case EventHandler.ERROR_UNSUPPORTED_SCHEME:
+                return "ERROR_UNSUPPORTED_SCHEME";
+
+            case EventHandler.ERROR_FAILED_SSL_HANDSHAKE:
+                return "ERROR_FAILED_SSL_HANDSHAKE";
+
+            case EventHandler.ERROR_BAD_URL:
+                return "ERROR_BAD_URL";
+
+            case EventHandler.FILE_ERROR:
+                return "FILE_ERROR";
+
+            case EventHandler.FILE_NOT_FOUND_ERROR:
+                return "FILE_NOT_FOUND_ERROR";
+
+            case EventHandler.TOO_MANY_REQUESTS_ERROR:
+                return "TOO_MANY_REQUESTS_ERROR";
+
+            default:
+                return "UNKNOWN_ERROR";
+        }
+    }
+
     HttpContext getHttpContext() {
         return mHttpContext;
     }
diff --git a/core/java/android/net/http/ErrorStrings.java b/core/java/android/net/http/ErrorStrings.java
deleted file mode 100644
index 8383681..0000000
--- a/core/java/android/net/http/ErrorStrings.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.net.http;
-
-import android.content.Context;
-import android.util.Log;
-
-/**
- * Localized strings for the error codes defined in EventHandler.
- *
- * {@hide}
- */
-public class ErrorStrings {
-    private ErrorStrings() { /* Utility class, don't instantiate. */ }
-
-    private static final String LOGTAG = "Http";
-
-    /**
-     * Get the localized error message resource for the given error code.
-     * If the code is unknown, we'll return a generic error message.
-     */
-    public static String getString(int errorCode, Context context) {
-        return context.getText(getResource(errorCode)).toString();
-    }
-
-    /**
-     * Get the localized error message resource for the given error code.
-     * If the code is unknown, we'll return a generic error message.
-     */
-    public static int getResource(int errorCode) {
-        switch(errorCode) {
-            case EventHandler.OK:
-                return com.android.internal.R.string.httpErrorOk;
-
-            case EventHandler.ERROR:
-                return com.android.internal.R.string.httpError;
-
-            case EventHandler.ERROR_LOOKUP:
-                return com.android.internal.R.string.httpErrorLookup;
-
-            case EventHandler.ERROR_UNSUPPORTED_AUTH_SCHEME:
-                return com.android.internal.R.string.httpErrorUnsupportedAuthScheme;
-
-            case EventHandler.ERROR_AUTH:
-                return com.android.internal.R.string.httpErrorAuth;
-
-            case EventHandler.ERROR_PROXYAUTH:
-                return com.android.internal.R.string.httpErrorProxyAuth;
-
-            case EventHandler.ERROR_CONNECT:
-                return com.android.internal.R.string.httpErrorConnect;
-
-            case EventHandler.ERROR_IO:
-                return com.android.internal.R.string.httpErrorIO;
-
-            case EventHandler.ERROR_TIMEOUT:
-                return com.android.internal.R.string.httpErrorTimeout;
-
-            case EventHandler.ERROR_REDIRECT_LOOP:
-                return com.android.internal.R.string.httpErrorRedirectLoop;
-
-            case EventHandler.ERROR_UNSUPPORTED_SCHEME:
-                return com.android.internal.R.string.httpErrorUnsupportedScheme;
-
-            case EventHandler.ERROR_FAILED_SSL_HANDSHAKE:
-                return com.android.internal.R.string.httpErrorFailedSslHandshake;
-
-            case EventHandler.ERROR_BAD_URL:
-                return com.android.internal.R.string.httpErrorBadUrl;
-
-            case EventHandler.FILE_ERROR:
-                return com.android.internal.R.string.httpErrorFile;
-
-            case EventHandler.FILE_NOT_FOUND_ERROR:
-                return com.android.internal.R.string.httpErrorFileNotFound;
-
-            case EventHandler.TOO_MANY_REQUESTS_ERROR:
-                return com.android.internal.R.string.httpErrorTooManyRequests;
-
-            default:
-                Log.w(LOGTAG, "Using generic message for unknown error code: " + errorCode);
-                return com.android.internal.R.string.httpError;
-        }
-    }
-}