Merge change I55f52567 into eclair-mr2

* changes:
  MessageCompose: fix NPE cased by WebView set to null in onDestroy().
This commit is contained in:
Android (Google) Code Review 2009-12-22 05:19:44 -08:00
commit 2b6dfc9796

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); }
} }
} }