am 9d024a5b: am 2b6dfc97: Merge change I55f52567 into eclair-mr2

Merge commit '9d024a5b4f42d9d7687d06e5f86f9c68f22fccf8'

* commit '9d024a5b4f42d9d7687d06e5f86f9c68f22fccf8':
  MessageCompose: fix NPE cased by WebView set to null in onDestroy().
This commit is contained in:
Mihai Preda 2009-12-22 10:15:53 -08:00 committed by Android Git Automerger
commit 1e1bb40062

View File

@ -1274,9 +1274,10 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
// EmailHtmlUtil.resolveInlineImage(getContentResolver(), mAccount, // EmailHtmlUtil.resolveInlineImage(getContentResolver(), mAccount,
// text, message, 0); // text, message, 0);
mQuotedTextBar.setVisibility(View.VISIBLE); mQuotedTextBar.setVisibility(View.VISIBLE);
if (mQuotedText != null) {
mQuotedText.setVisibility(View.VISIBLE); mQuotedText.setVisibility(View.VISIBLE);
mQuotedText.loadDataWithBaseURL("email://", text, "text/html", mQuotedText.loadDataWithBaseURL("email://", text, "text/html", "utf-8", null);
"utf-8", null); }
} }
} }