Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 23461 into eclair

Browse Source 
* changes:
  Mimetypes in ContactsProvider2 shouldn't overlap with those in ContactsProvider
This commit is contained in:
Android (Google) Code Review
2009-09-01 13:09:25 -07:00
parent 6ff270fd85 b3c4998284
commit 394c92ef15
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/provider/ContactsContract.java
View File

@@ -991,13 +991,13 @@ public final class ContactsContract {
private Phone() {} private Phone() {}
/** MIME type used when storing this in data table. */ /** MIME type used when storing this in data table. */
public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/phone"; public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/phone_v2";
/** /**
* The MIME type of {@link #CONTENT_URI} providing a directory of * The MIME type of {@link #CONTENT_URI} providing a directory of
* phones. * phones.
*/ */
public static final String CONTENT_TYPE = "vnd.android.cursor.dir/phone"; public static final String CONTENT_TYPE = "vnd.android.cursor.dir/phone_v2";
/** /**
* The content:// style URI for all data records of the * The content:// style URI for all data records of the
@@ -1076,7 +1076,7 @@ public final class ContactsContract {
private Email() {} private Email() {}
/** MIME type used when storing this in data table. */ /** MIME type used when storing this in data table. */
public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/email"; public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/email_v2";
/** /**
* The content:// style URI for all data records of the * The content:// style URI for all data records of the
@@ -1114,13 +1114,14 @@ public final class ContactsContract {
} }
/** MIME type used when storing this in data table. */ /** MIME type used when storing this in data table. */
public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/postal-address"; public static final String CONTENT_ITEM_TYPE =
"vnd.android.cursor.item/postal-address_v2";
/** /**
* The MIME type of {@link #CONTENT_URI} providing a directory of * The MIME type of {@link #CONTENT_URI} providing a directory of
* postal addresses. * postal addresses.
*/ */
public static final String CONTENT_TYPE = "vnd.android.cursor.dir/postal-address"; public static final String CONTENT_TYPE = "vnd.android.cursor.dir/postal-address_v2";
/** /**
* The content:// style URI for all data records of the * The content:// style URI for all data records of the