diff options
| author | Dave Santoro <dsantoro@google.com> | 2011-07-20 12:43:26 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-20 12:43:26 -0700 |
| commit | 32911e72af9e8cc62ddd094aebac4d3d075badcb (patch) | |
| tree | df1bd2d7cb539c1510df6820d07da7c32fffbd86 /api | |
| parent | 7288ebd8e5ce44b782e919d296caddce9f5192fa (diff) | |
| parent | 040e6b302cc47afbda9d8d08ac3b02c8192eccab (diff) | |
| download | frameworks_base-32911e72af9e8cc62ddd094aebac4d3d075badcb.zip frameworks_base-32911e72af9e8cc62ddd094aebac4d3d075badcb.tar.gz frameworks_base-32911e72af9e8cc62ddd094aebac4d3d075badcb.tar.bz2 | |
Merge "Updates and fixes for the social stream API."
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index 3802bc2..8fc3a72 100644 --- a/api/current.txt +++ b/api/current.txt @@ -16231,12 +16231,14 @@ package android.provider { } public static final class ContactsContract.StreamItemPhotos implements android.provider.BaseColumns android.provider.ContactsContract.StreamItemPhotosColumns { + field public static final java.lang.String PHOTO = "photo"; } protected static abstract interface ContactsContract.StreamItemPhotosColumns { field public static final java.lang.String ACTION = "action"; field public static final java.lang.String ACTION_URI = "action_uri"; - field public static final java.lang.String PICTURE = "picture"; + field public static final java.lang.String PHOTO_FILE_ID = "photo_file_id"; + field public static final java.lang.String PHOTO_URI = "photo_uri"; field public static final java.lang.String SORT_INDEX = "sort_index"; field public static final java.lang.String STREAM_ITEM_ID = "stream_item_id"; } @@ -16246,7 +16248,6 @@ package android.provider { field public static final android.net.Uri CONTENT_PHOTO_URI; field public static final android.net.Uri CONTENT_URI; field public static final java.lang.String MAX_ITEMS = "max_items"; - field public static final java.lang.String PHOTO_MAX_BYTES = "photo_max_bytes"; } public static final class ContactsContract.StreamItems.StreamItemPhotos implements android.provider.BaseColumns android.provider.ContactsContract.StreamItemPhotosColumns { |