diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-01 10:14:10 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-01 10:14:10 -0700 |
| commit | 169ae05f9f5cce400dd936e2a31676b80d84b862 (patch) | |
| tree | 0442928971f35f1bd1a4a743a61b86034e43261c | |
| parent | b51b40982d06813bd3b325b4f0d1fa698ab3f897 (diff) | |
| parent | 4e441b711a07ff9cce3dd62169c54e6eea244a0a (diff) | |
| download | frameworks_base-169ae05f9f5cce400dd936e2a31676b80d84b862.zip frameworks_base-169ae05f9f5cce400dd936e2a31676b80d84b862.tar.gz frameworks_base-169ae05f9f5cce400dd936e2a31676b80d84b862.tar.bz2 | |
Merge change 23439 into eclair
* changes:
if exception getMessage() is null, don't add it to the error
| -rw-r--r-- | core/java/android/webkit/ContentLoader.java | 28 | ||||
| -rw-r--r-- | core/java/android/webkit/FileLoader.java | 18 |
2 files changed, 24 insertions, 22 deletions
diff --git a/core/java/android/webkit/ContentLoader.java b/core/java/android/webkit/ContentLoader.java index 27cd6b5..19aa087 100644 --- a/core/java/android/webkit/ContentLoader.java +++ b/core/java/android/webkit/ContentLoader.java @@ -57,6 +57,16 @@ class ContentLoader extends StreamLoader { } + private String errString(Exception ex) { + String exMessage = ex.getMessage(); + String errString = mContext.getString( + com.android.internal.R.string.httpErrorFileNotFound); + if (exMessage != null) { + errString += " " + exMessage; + } + return errString; + } + @Override protected boolean setupStreamAndSendStatus() { Uri uri = Uri.parse(mUrl); @@ -73,28 +83,16 @@ class ContentLoader extends StreamLoader { mDataStream = mContext.getContentResolver().openInputStream(uri); mHandler.status(1, 1, 0, "OK"); } catch (java.io.FileNotFoundException ex) { - mHandler.error( - EventHandler.FILE_NOT_FOUND_ERROR, - mContext.getString( - com.android.internal.R.string.httpErrorFileNotFound) + - " " + ex.getMessage()); + mHandler.error(EventHandler.FILE_NOT_FOUND_ERROR, errString(ex)); return false; } catch (java.io.IOException ex) { - mHandler.error( - EventHandler.FILE_ERROR, - mContext.getString( - com.android.internal.R.string.httpErrorFileNotFound) + - " " + ex.getMessage()); + mHandler.error(EventHandler.FILE_ERROR, errString(ex)); return false; } catch (RuntimeException ex) { // readExceptionWithFileNotFoundExceptionFromParcel in DatabaseUtils // can throw a serial of RuntimeException. Catch them all here. - mHandler.error( - EventHandler.FILE_ERROR, - mContext.getString( - com.android.internal.R.string.httpErrorFileNotFound) + - " " + ex.getMessage()); + mHandler.error(EventHandler.FILE_ERROR, errString(ex)); return false; } return true; diff --git a/core/java/android/webkit/FileLoader.java b/core/java/android/webkit/FileLoader.java index 54a4c1d..085f1f4 100644 --- a/core/java/android/webkit/FileLoader.java +++ b/core/java/android/webkit/FileLoader.java @@ -72,6 +72,15 @@ class FileLoader extends StreamLoader { } } + private String errString(Exception ex) { + String exMessage = ex.getMessage(); + String errString = mContext.getString(R.string.httpErrorFileNotFound); + if (exMessage != null) { + errString += " " + exMessage; + } + return errString; + } + @Override protected boolean setupStreamAndSendStatus() { try { @@ -95,16 +104,11 @@ class FileLoader extends StreamLoader { mHandler.status(1, 1, 0, "OK"); } catch (java.io.FileNotFoundException ex) { - mHandler.error( - EventHandler.FILE_NOT_FOUND_ERROR, - mContext.getString(R.string.httpErrorFileNotFound) + - " " + ex.getMessage()); + mHandler.error(EventHandler.FILE_NOT_FOUND_ERROR, errString(ex)); return false; } catch (java.io.IOException ex) { - mHandler.error(EventHandler.FILE_ERROR, - mContext.getString(R.string.httpErrorFileNotFound) + - " " + ex.getMessage()); + mHandler.error(EventHandler.FILE_ERROR, errString(ex)); return false; } return true; |