diff options
author | Hemant Gupta <hemantg@codeaurora.org> | 2014-09-24 13:44:04 +0530 |
---|---|---|
committer | Linux Build Service Account <lnxbuild@localhost> | 2014-11-04 08:26:07 -0700 |
commit | 195545434e8f6b18c929cfcf567367f3b67a7a55 (patch) | |
tree | be79d27828fd635c66d4c0961a609aee11a42672 | |
parent | 65092b9ab5c8372b748bf3958ec14f97fe2ac71b (diff) | |
download | android_packages_apps_Bluetooth-195545434e8f6b18c929cfcf567367f3b67a7a55.tar.gz android_packages_apps_Bluetooth-195545434e8f6b18c929cfcf567367f3b67a7a55.tar.bz2 android_packages_apps_Bluetooth-195545434e8f6b18c929cfcf567367f3b67a7a55.zip |
Revert "MAP: Workaround for missing size values in message data base"
This reverts commit 8b17c7f2f98bbea105a41a0bb962a4581b7cce5c.
Change-Id: I1bccab5135132d6e64fddfa83ba069830a74092f
-rw-r--r-- | src/com/android/bluetooth/map/BluetoothMapContent.java | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/src/com/android/bluetooth/map/BluetoothMapContent.java b/src/com/android/bluetooth/map/BluetoothMapContent.java index 41df206e6..58bfc5289 100644 --- a/src/com/android/bluetooth/map/BluetoothMapContent.java +++ b/src/com/android/bluetooth/map/BluetoothMapContent.java @@ -459,22 +459,12 @@ public class BluetoothMapContent { if (fi.mMsgType == FilterInfo.TYPE_MMS) { if(c.getInt(fi.mMmsColTextOnly) == 0) { size = c.getInt(fi.mMmsColAttachmentSize); - if(size <= 0) { - // We know there are attachments, since it is not TextOnly - // Hence the size in the database must be wrong. - // Set size to 1 to indicate to the client, that attachments are present - if (D) Log.d(TAG, "Error in message database, size reported as: " + size - + " Changing size to 1"); - size = 1; - } } } else if (fi.mMsgType == FilterInfo.TYPE_EMAIL) { int attachment = c.getInt(fi.mEmailColAttachment); size = c.getInt(fi.mEmailColAttachementSize); if(attachment == 1 && size == 0) { - if (D) Log.d(TAG, "Error in message database, attachment size reported as: " + size - + " Changing size to 1"); - size = 1; /* Ensure we indicate we have attachments in the size, if the + size = 1; /* Ensure we indicate we have attachments in the size, it the message has attachments, in case the e-mail client do not report a size */ } @@ -532,14 +522,6 @@ public class BluetoothMapContent { } else if (fi.mMsgType == FilterInfo.TYPE_EMAIL) { size = c.getInt(fi.mEmailColSize); } - if(size <= 0) { - // A message cannot have size 0 - // Hence the size in the database must be wrong. - // Set size to 1 to indicate to the client, that the message has content. - if (D) Log.d(TAG, "Error in message database, size reported as: " + size - + " Changing size to 1"); - size = 1; - } if (V) Log.d(TAG, "setSize: " + size); e.setSize(size); } |