Merge change Ie8672184 into eclair-mr2

* changes:
  Add error code column to SMS
This commit is contained in:
Android (Google) Code Review
2009-10-29 11:07:15 -04:00

View File

@@ -152,6 +152,12 @@ public final class Telephony {
* <P>Type: INTEGER (boolean)</P> * <P>Type: INTEGER (boolean)</P>
*/ */
public static final String LOCKED = "locked"; public static final String LOCKED = "locked";
/**
* Error code associated with sending or receiving this message
* <P>Type: INTEGER</P>
*/
public static final String ERROR_CODE = "error_code";
} }
/** /**
@@ -243,7 +249,7 @@ public final class Telephony {
* @return true if the operation succeeded * @return true if the operation succeeded
*/ */
public static boolean moveMessageToFolder(Context context, public static boolean moveMessageToFolder(Context context,
Uri uri, int folder) { Uri uri, int folder, int error) {
if (uri == null) { if (uri == null) {
return false; return false;
} }
@@ -266,7 +272,7 @@ public final class Telephony {
return false; return false;
} }
ContentValues values = new ContentValues(2); ContentValues values = new ContentValues(3);
values.put(TYPE, folder); values.put(TYPE, folder);
if (markAsUnread) { if (markAsUnread) {
@@ -274,6 +280,7 @@ public final class Telephony {
} else if (markAsRead) { } else if (markAsRead) {
values.put(READ, Integer.valueOf(1)); values.put(READ, Integer.valueOf(1));
} }
values.put(ERROR_CODE, error);
return 1 == SqliteWrapper.update(context, context.getContentResolver(), return 1 == SqliteWrapper.update(context, context.getContentResolver(),
uri, values, null, null); uri, values, null, null);