Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 169ae05f: Merge change 23439 into eclair

Browse Source 
Merge commit '169ae05f9f5cce400dd936e2a31676b80d84b862' into eclair-plus-aosp

* commit '169ae05f9f5cce400dd936e2a31676b80d84b862':
  if exception getMessage() is null, don't add it to the error
This commit is contained in:
Cary Clark
2009-09-01 10:15:51 -07:00
committed by Android Git Automerger
parent 9af39a5700 169ae05f9f
commit 1b0f6e82f6
2 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
core/java/android/webkit/ContentLoader.java
View File

@@ -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;

18
core/java/android/webkit/FileLoader.java
View File

@@ -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;