am f752adfa: am 6d1271ae: Fix crash in large tests (#2108431)

Merge commit 'f752adfa40026017db93a0042ddbf4feb69b25d0'

* commit 'f752adfa40026017db93a0042ddbf4feb69b25d0':
  Fix crash in large tests (#2108431)
This commit is contained in:
Marc Blank 2009-09-09 16:29:40 -07:00 committed by Android Git Automerger
commit aae1e72b9d

View File

@ -672,6 +672,7 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
String action = getIntent().getAction(); String action = getIntent().getAction();
// Use the Intent to set flags saying this message is a reply or a forward and save the // Use the Intent to set flags saying this message is a reply or a forward and save the
// unique id of the source message // unique id of the source message
if (mSource != null) {
if (ACTION_REPLY.equals(action) || ACTION_REPLY_ALL.equals(action)) { if (ACTION_REPLY.equals(action) || ACTION_REPLY_ALL.equals(action)) {
message.mFlags |= Message.FLAG_TYPE_REPLY; message.mFlags |= Message.FLAG_TYPE_REPLY;
message.mSourceKey = mSource.mId; message.mSourceKey = mSource.mId;
@ -680,6 +681,7 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
message.mSourceKey = mSource.mId; message.mSourceKey = mSource.mId;
} }
} }
}
private Attachment[] getAttachmentsFromUI() { private Attachment[] getAttachmentsFromUI() {
int count = mAttachments.getChildCount(); int count = mAttachments.getChildCount();