avoid IllegalStateException in MessagingNotification

If columnIndex is -1, c.getLong(columnIndex) makes IllegalStatementException.
So, the columnIndex should be checked -1 or not before using.

Change-Id: Id0dfffa5159d22dc67d56003b999dce80378736e
Merge "avoid IllegalStateException in MessagingNotification"
Clear collection after we used

Change-Id: Idbec734a2227cb333ed1cc47d64647a9da460e76
Signed-off-by: Roger Chen <cxr514033970@gmail.com>
Merge remote-tracking branch 'aosp/master' into jb-dev
Merge "Clear collection after we used"
Correct attachment type for Mms only has subject

Mark the attachment type of Mms only has subject as TEXT
avoid to show Mms View as untimely

Change-Id: I346ae4af4983e9e8dbe9533eeddef445affc339a
Signed-off-by: Roger Chen <cxr514033970@gmail.com>
Merge "Correct attachment type for Mms only has subject"
Merge remote-tracking branch 'aosp/master' into jb-dev

Conflicts:
	src/com/android/mms/transaction/MessagingNotification.java

Change-Id: I020d1430d3b3ec0342f8bd037461e996853996d2