Merge commit '6d1271aee78f195e094aca650d8dceee79fbb5e4' into eclair-plus-aosp * commit '6d1271aee78f195e094aca650d8dceee79fbb5e4': Fix crash in large tests (#2108431)
This commit is contained in:
commit
f752adfa40
@ -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();
|
||||||
|
Loading…
Reference in New Issue
Block a user