diff --git a/api/current.txt b/api/current.txt index 958f26f7073cc..dec83ba85122c 100644 --- a/api/current.txt +++ b/api/current.txt @@ -105,7 +105,9 @@ package android { field public static final deprecated java.lang.String READ_INPUT_STATE = "android.permission.READ_INPUT_STATE"; field public static final java.lang.String READ_LOGS = "android.permission.READ_LOGS"; field public static final java.lang.String READ_PHONE_STATE = "android.permission.READ_PHONE_STATE"; + field public static final deprecated java.lang.String READ_PROFILE = "android.permission.READ_PROFILE"; field public static final java.lang.String READ_SMS = "android.permission.READ_SMS"; + field public static final deprecated java.lang.String READ_SOCIAL_STREAM = "android.permission.READ_SOCIAL_STREAM"; field public static final java.lang.String READ_SYNC_SETTINGS = "android.permission.READ_SYNC_SETTINGS"; field public static final java.lang.String READ_SYNC_STATS = "android.permission.READ_SYNC_STATS"; field public static final java.lang.String READ_USER_DICTIONARY = "android.permission.READ_USER_DICTIONARY"; @@ -150,8 +152,10 @@ package android { field public static final java.lang.String WRITE_CONTACTS = "android.permission.WRITE_CONTACTS"; field public static final java.lang.String WRITE_EXTERNAL_STORAGE = "android.permission.WRITE_EXTERNAL_STORAGE"; field public static final java.lang.String WRITE_GSERVICES = "android.permission.WRITE_GSERVICES"; + field public static final deprecated java.lang.String WRITE_PROFILE = "android.permission.WRITE_PROFILE"; field public static final java.lang.String WRITE_SECURE_SETTINGS = "android.permission.WRITE_SECURE_SETTINGS"; field public static final java.lang.String WRITE_SETTINGS = "android.permission.WRITE_SETTINGS"; + field public static final deprecated java.lang.String WRITE_SOCIAL_STREAM = "android.permission.WRITE_SOCIAL_STREAM"; field public static final java.lang.String WRITE_SYNC_SETTINGS = "android.permission.WRITE_SYNC_SETTINGS"; field public static final java.lang.String WRITE_USER_DICTIONARY = "android.permission.WRITE_USER_DICTIONARY"; field public static final java.lang.String WRITE_VOICEMAIL = "com.android.voicemail.permission.WRITE_VOICEMAIL"; @@ -168,6 +172,7 @@ package android { field public static final java.lang.String PHONE = "android.permission-group.PHONE"; field public static final java.lang.String SENSORS = "android.permission-group.SENSORS"; field public static final java.lang.String SMS = "android.permission-group.SMS"; + field public static final java.lang.String SOCIAL_INFO = "android.permission-group.SOCIAL_INFO"; field public static final java.lang.String STORAGE = "android.permission-group.STORAGE"; field public static final java.lang.String USER_DICTIONARY = "android.permission-group.USER_DICTIONARY"; } @@ -25574,6 +25579,10 @@ package android.provider { field public static final java.lang.String PHOTO_FILE_ID = "data14"; } + public static final deprecated class ContactsContract.Contacts.StreamItems implements android.provider.ContactsContract.StreamItemsColumns { + field public static final deprecated java.lang.String CONTENT_DIRECTORY = "stream_items"; + } + protected static abstract interface ContactsContract.ContactsColumns { field public static final java.lang.String CONTACT_LAST_UPDATED_TIMESTAMP = "contact_last_updated_timestamp"; field public static final java.lang.String DISPLAY_NAME = "display_name"; @@ -25889,6 +25898,10 @@ package android.provider { field public static final java.lang.String DATA_ID = "data_id"; } + public static final deprecated class ContactsContract.RawContacts.StreamItems implements android.provider.BaseColumns android.provider.ContactsContract.StreamItemsColumns { + field public static final deprecated java.lang.String CONTENT_DIRECTORY = "stream_items"; + } + protected static abstract interface ContactsContract.RawContactsColumns { field public static final java.lang.String ACCOUNT_TYPE_AND_DATA_SET = "account_type_and_data_set"; field public static final java.lang.String AGGREGATION_MODE = "aggregation_mode"; @@ -25959,6 +25972,56 @@ package android.provider { field public static final android.net.Uri PROFILE_CONTENT_URI; } + public static final deprecated class ContactsContract.StreamItemPhotos implements android.provider.BaseColumns android.provider.ContactsContract.StreamItemPhotosColumns { + field public static final deprecated java.lang.String PHOTO = "photo"; + } + + protected static abstract deprecated interface ContactsContract.StreamItemPhotosColumns { + field public static final deprecated java.lang.String PHOTO_FILE_ID = "photo_file_id"; + field public static final deprecated java.lang.String PHOTO_URI = "photo_uri"; + field public static final deprecated java.lang.String SORT_INDEX = "sort_index"; + field public static final deprecated java.lang.String STREAM_ITEM_ID = "stream_item_id"; + field public static final deprecated java.lang.String SYNC1 = "stream_item_photo_sync1"; + field public static final deprecated java.lang.String SYNC2 = "stream_item_photo_sync2"; + field public static final deprecated java.lang.String SYNC3 = "stream_item_photo_sync3"; + field public static final deprecated java.lang.String SYNC4 = "stream_item_photo_sync4"; + } + + public static final deprecated class ContactsContract.StreamItems implements android.provider.BaseColumns android.provider.ContactsContract.StreamItemsColumns { + field public static final deprecated java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/stream_item"; + field public static final deprecated android.net.Uri CONTENT_LIMIT_URI; + field public static final deprecated android.net.Uri CONTENT_PHOTO_URI; + field public static final deprecated java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/stream_item"; + field public static final deprecated android.net.Uri CONTENT_URI; + field public static final deprecated java.lang.String MAX_ITEMS = "max_items"; + } + + public static final deprecated class ContactsContract.StreamItems.StreamItemPhotos implements android.provider.BaseColumns android.provider.ContactsContract.StreamItemPhotosColumns { + field public static final deprecated java.lang.String CONTENT_DIRECTORY = "photo"; + field public static final deprecated java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/stream_item_photo"; + field public static final deprecated java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/stream_item_photo"; + } + + protected static abstract deprecated interface ContactsContract.StreamItemsColumns { + field public static final deprecated java.lang.String ACCOUNT_NAME = "account_name"; + field public static final deprecated java.lang.String ACCOUNT_TYPE = "account_type"; + field public static final deprecated java.lang.String COMMENTS = "comments"; + field public static final deprecated java.lang.String CONTACT_ID = "contact_id"; + field public static final deprecated java.lang.String CONTACT_LOOKUP_KEY = "contact_lookup"; + field public static final deprecated java.lang.String DATA_SET = "data_set"; + field public static final deprecated java.lang.String RAW_CONTACT_ID = "raw_contact_id"; + field public static final deprecated java.lang.String RAW_CONTACT_SOURCE_ID = "raw_contact_source_id"; + field public static final deprecated java.lang.String RES_ICON = "icon"; + field public static final deprecated java.lang.String RES_LABEL = "label"; + field public static final deprecated java.lang.String RES_PACKAGE = "res_package"; + field public static final deprecated java.lang.String SYNC1 = "stream_item_sync1"; + field public static final deprecated java.lang.String SYNC2 = "stream_item_sync2"; + field public static final deprecated java.lang.String SYNC3 = "stream_item_sync3"; + field public static final deprecated java.lang.String SYNC4 = "stream_item_sync4"; + field public static final deprecated java.lang.String TEXT = "text"; + field public static final deprecated java.lang.String TIMESTAMP = "timestamp"; + } + protected static abstract interface ContactsContract.SyncColumns implements android.provider.ContactsContract.BaseSyncColumns { field public static final java.lang.String ACCOUNT_NAME = "account_name"; field public static final java.lang.String ACCOUNT_TYPE = "account_type"; diff --git a/api/removed.txt b/api/removed.txt index 7fc927bcffa6e..2e6c6854a0902 100644 --- a/api/removed.txt +++ b/api/removed.txt @@ -117,64 +117,6 @@ package android.provider { field public static final deprecated java.lang.String URL = "url"; } - public static final deprecated class ContactsContract.Contacts.StreamItems { - field public static final deprecated java.lang.String CONTENT_DIRECTORY = "stream_items"; - } - - public static final deprecated class ContactsContract.RawContacts.StreamItems implements android.provider.BaseColumns { - field public static final deprecated java.lang.String CONTENT_DIRECTORY = "stream_items"; - } - - public static final deprecated class ContactsContract.StreamItemPhotos implements android.provider.BaseColumns { - field public static final deprecated java.lang.String PHOTO = "photo"; - } - - protected static abstract deprecated interface ContactsContract.StreamItemPhotosColumns { - field public static final deprecated java.lang.String PHOTO_FILE_ID = "photo_file_id"; - field public static final deprecated java.lang.String PHOTO_URI = "photo_uri"; - field public static final deprecated java.lang.String SORT_INDEX = "sort_index"; - field public static final deprecated java.lang.String STREAM_ITEM_ID = "stream_item_id"; - field public static final deprecated java.lang.String SYNC1 = "stream_item_photo_sync1"; - field public static final deprecated java.lang.String SYNC2 = "stream_item_photo_sync2"; - field public static final deprecated java.lang.String SYNC3 = "stream_item_photo_sync3"; - field public static final deprecated java.lang.String SYNC4 = "stream_item_photo_sync4"; - } - - public static final deprecated class ContactsContract.StreamItems implements android.provider.BaseColumns { - field public static final deprecated java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/stream_item"; - field public static final deprecated android.net.Uri CONTENT_LIMIT_URI; - field public static final deprecated android.net.Uri CONTENT_PHOTO_URI; - field public static final deprecated java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/stream_item"; - field public static final deprecated android.net.Uri CONTENT_URI; - field public static final deprecated java.lang.String MAX_ITEMS = "max_items"; - } - - public static final deprecated class ContactsContract.StreamItems.StreamItemPhotos implements android.provider.BaseColumns { - field public static final deprecated java.lang.String CONTENT_DIRECTORY = "photo"; - field public static final deprecated java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/stream_item_photo"; - field public static final deprecated java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/stream_item_photo"; - } - - protected static abstract deprecated interface ContactsContract.StreamItemsColumns { - field public static final deprecated java.lang.String ACCOUNT_NAME = "account_name"; - field public static final deprecated java.lang.String ACCOUNT_TYPE = "account_type"; - field public static final deprecated java.lang.String COMMENTS = "comments"; - field public static final deprecated java.lang.String CONTACT_ID = "contact_id"; - field public static final deprecated java.lang.String CONTACT_LOOKUP_KEY = "contact_lookup"; - field public static final deprecated java.lang.String DATA_SET = "data_set"; - field public static final deprecated java.lang.String RAW_CONTACT_ID = "raw_contact_id"; - field public static final deprecated java.lang.String RAW_CONTACT_SOURCE_ID = "raw_contact_source_id"; - field public static final deprecated java.lang.String RES_ICON = "icon"; - field public static final deprecated java.lang.String RES_LABEL = "label"; - field public static final deprecated java.lang.String RES_PACKAGE = "res_package"; - field public static final deprecated java.lang.String SYNC1 = "stream_item_sync1"; - field public static final deprecated java.lang.String SYNC2 = "stream_item_sync2"; - field public static final deprecated java.lang.String SYNC3 = "stream_item_sync3"; - field public static final deprecated java.lang.String SYNC4 = "stream_item_sync4"; - field public static final deprecated java.lang.String TEXT = "text"; - field public static final deprecated java.lang.String TIMESTAMP = "timestamp"; - } - public static final class Settings.System extends android.provider.Settings.NameValueTable { field public static final java.lang.String APPEND_FOR_LAST_AUDIBLE = "_last_audible"; field public static final java.lang.String VOLUME_ALARM = "volume_alarm"; diff --git a/api/system-current.txt b/api/system-current.txt index ce4f399b267ed..2353b3fc4f3c9 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -156,8 +156,10 @@ package android { field public static final java.lang.String READ_NETWORK_USAGE_HISTORY = "android.permission.READ_NETWORK_USAGE_HISTORY"; field public static final java.lang.String READ_PHONE_STATE = "android.permission.READ_PHONE_STATE"; field public static final java.lang.String READ_PRIVILEGED_PHONE_STATE = "android.permission.READ_PRIVILEGED_PHONE_STATE"; + field public static final deprecated java.lang.String READ_PROFILE = "android.permission.READ_PROFILE"; field public static final java.lang.String READ_SEARCH_INDEXABLES = "android.permission.READ_SEARCH_INDEXABLES"; field public static final java.lang.String READ_SMS = "android.permission.READ_SMS"; + field public static final deprecated java.lang.String READ_SOCIAL_STREAM = "android.permission.READ_SOCIAL_STREAM"; field public static final java.lang.String READ_SYNC_SETTINGS = "android.permission.READ_SYNC_SETTINGS"; field public static final java.lang.String READ_SYNC_STATS = "android.permission.READ_SYNC_STATS"; field public static final java.lang.String READ_USER_DICTIONARY = "android.permission.READ_USER_DICTIONARY"; @@ -225,8 +227,10 @@ package android { field public static final java.lang.String WRITE_EXTERNAL_STORAGE = "android.permission.WRITE_EXTERNAL_STORAGE"; field public static final java.lang.String WRITE_GSERVICES = "android.permission.WRITE_GSERVICES"; field public static final java.lang.String WRITE_MEDIA_STORAGE = "android.permission.WRITE_MEDIA_STORAGE"; + field public static final deprecated java.lang.String WRITE_PROFILE = "android.permission.WRITE_PROFILE"; field public static final java.lang.String WRITE_SECURE_SETTINGS = "android.permission.WRITE_SECURE_SETTINGS"; field public static final java.lang.String WRITE_SETTINGS = "android.permission.WRITE_SETTINGS"; + field public static final deprecated java.lang.String WRITE_SOCIAL_STREAM = "android.permission.WRITE_SOCIAL_STREAM"; field public static final java.lang.String WRITE_SYNC_SETTINGS = "android.permission.WRITE_SYNC_SETTINGS"; field public static final java.lang.String WRITE_USER_DICTIONARY = "android.permission.WRITE_USER_DICTIONARY"; field public static final java.lang.String WRITE_VOICEMAIL = "com.android.voicemail.permission.WRITE_VOICEMAIL"; @@ -243,6 +247,7 @@ package android { field public static final java.lang.String PHONE = "android.permission-group.PHONE"; field public static final java.lang.String SENSORS = "android.permission-group.SENSORS"; field public static final java.lang.String SMS = "android.permission-group.SMS"; + field public static final java.lang.String SOCIAL_INFO = "android.permission-group.SOCIAL_INFO"; field public static final java.lang.String STORAGE = "android.permission-group.STORAGE"; field public static final java.lang.String USER_DICTIONARY = "android.permission-group.USER_DICTIONARY"; } @@ -27519,6 +27524,10 @@ package android.provider { field public static final java.lang.String PHOTO_FILE_ID = "data14"; } + public static final deprecated class ContactsContract.Contacts.StreamItems implements android.provider.ContactsContract.StreamItemsColumns { + field public static final deprecated java.lang.String CONTENT_DIRECTORY = "stream_items"; + } + protected static abstract interface ContactsContract.ContactsColumns { field public static final java.lang.String CONTACT_LAST_UPDATED_TIMESTAMP = "contact_last_updated_timestamp"; field public static final java.lang.String DISPLAY_NAME = "display_name"; @@ -27834,6 +27843,10 @@ package android.provider { field public static final java.lang.String DATA_ID = "data_id"; } + public static final deprecated class ContactsContract.RawContacts.StreamItems implements android.provider.BaseColumns android.provider.ContactsContract.StreamItemsColumns { + field public static final deprecated java.lang.String CONTENT_DIRECTORY = "stream_items"; + } + protected static abstract interface ContactsContract.RawContactsColumns { field public static final java.lang.String ACCOUNT_TYPE_AND_DATA_SET = "account_type_and_data_set"; field public static final java.lang.String AGGREGATION_MODE = "aggregation_mode"; @@ -27904,6 +27917,56 @@ package android.provider { field public static final android.net.Uri PROFILE_CONTENT_URI; } + public static final deprecated class ContactsContract.StreamItemPhotos implements android.provider.BaseColumns android.provider.ContactsContract.StreamItemPhotosColumns { + field public static final deprecated java.lang.String PHOTO = "photo"; + } + + protected static abstract deprecated interface ContactsContract.StreamItemPhotosColumns { + field public static final deprecated java.lang.String PHOTO_FILE_ID = "photo_file_id"; + field public static final deprecated java.lang.String PHOTO_URI = "photo_uri"; + field public static final deprecated java.lang.String SORT_INDEX = "sort_index"; + field public static final deprecated java.lang.String STREAM_ITEM_ID = "stream_item_id"; + field public static final deprecated java.lang.String SYNC1 = "stream_item_photo_sync1"; + field public static final deprecated java.lang.String SYNC2 = "stream_item_photo_sync2"; + field public static final deprecated java.lang.String SYNC3 = "stream_item_photo_sync3"; + field public static final deprecated java.lang.String SYNC4 = "stream_item_photo_sync4"; + } + + public static final deprecated class ContactsContract.StreamItems implements android.provider.BaseColumns android.provider.ContactsContract.StreamItemsColumns { + field public static final deprecated java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/stream_item"; + field public static final deprecated android.net.Uri CONTENT_LIMIT_URI; + field public static final deprecated android.net.Uri CONTENT_PHOTO_URI; + field public static final deprecated java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/stream_item"; + field public static final deprecated android.net.Uri CONTENT_URI; + field public static final deprecated java.lang.String MAX_ITEMS = "max_items"; + } + + public static final deprecated class ContactsContract.StreamItems.StreamItemPhotos implements android.provider.BaseColumns android.provider.ContactsContract.StreamItemPhotosColumns { + field public static final deprecated java.lang.String CONTENT_DIRECTORY = "photo"; + field public static final deprecated java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/stream_item_photo"; + field public static final deprecated java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/stream_item_photo"; + } + + protected static abstract deprecated interface ContactsContract.StreamItemsColumns { + field public static final deprecated java.lang.String ACCOUNT_NAME = "account_name"; + field public static final deprecated java.lang.String ACCOUNT_TYPE = "account_type"; + field public static final deprecated java.lang.String COMMENTS = "comments"; + field public static final deprecated java.lang.String CONTACT_ID = "contact_id"; + field public static final deprecated java.lang.String CONTACT_LOOKUP_KEY = "contact_lookup"; + field public static final deprecated java.lang.String DATA_SET = "data_set"; + field public static final deprecated java.lang.String RAW_CONTACT_ID = "raw_contact_id"; + field public static final deprecated java.lang.String RAW_CONTACT_SOURCE_ID = "raw_contact_source_id"; + field public static final deprecated java.lang.String RES_ICON = "icon"; + field public static final deprecated java.lang.String RES_LABEL = "label"; + field public static final deprecated java.lang.String RES_PACKAGE = "res_package"; + field public static final deprecated java.lang.String SYNC1 = "stream_item_sync1"; + field public static final deprecated java.lang.String SYNC2 = "stream_item_sync2"; + field public static final deprecated java.lang.String SYNC3 = "stream_item_sync3"; + field public static final deprecated java.lang.String SYNC4 = "stream_item_sync4"; + field public static final deprecated java.lang.String TEXT = "text"; + field public static final deprecated java.lang.String TIMESTAMP = "timestamp"; + } + protected static abstract interface ContactsContract.SyncColumns implements android.provider.ContactsContract.BaseSyncColumns { field public static final java.lang.String ACCOUNT_NAME = "account_name"; field public static final java.lang.String ACCOUNT_TYPE = "account_type"; diff --git a/api/system-removed.txt b/api/system-removed.txt index 7fc927bcffa6e..2e6c6854a0902 100644 --- a/api/system-removed.txt +++ b/api/system-removed.txt @@ -117,64 +117,6 @@ package android.provider { field public static final deprecated java.lang.String URL = "url"; } - public static final deprecated class ContactsContract.Contacts.StreamItems { - field public static final deprecated java.lang.String CONTENT_DIRECTORY = "stream_items"; - } - - public static final deprecated class ContactsContract.RawContacts.StreamItems implements android.provider.BaseColumns { - field public static final deprecated java.lang.String CONTENT_DIRECTORY = "stream_items"; - } - - public static final deprecated class ContactsContract.StreamItemPhotos implements android.provider.BaseColumns { - field public static final deprecated java.lang.String PHOTO = "photo"; - } - - protected static abstract deprecated interface ContactsContract.StreamItemPhotosColumns { - field public static final deprecated java.lang.String PHOTO_FILE_ID = "photo_file_id"; - field public static final deprecated java.lang.String PHOTO_URI = "photo_uri"; - field public static final deprecated java.lang.String SORT_INDEX = "sort_index"; - field public static final deprecated java.lang.String STREAM_ITEM_ID = "stream_item_id"; - field public static final deprecated java.lang.String SYNC1 = "stream_item_photo_sync1"; - field public static final deprecated java.lang.String SYNC2 = "stream_item_photo_sync2"; - field public static final deprecated java.lang.String SYNC3 = "stream_item_photo_sync3"; - field public static final deprecated java.lang.String SYNC4 = "stream_item_photo_sync4"; - } - - public static final deprecated class ContactsContract.StreamItems implements android.provider.BaseColumns { - field public static final deprecated java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/stream_item"; - field public static final deprecated android.net.Uri CONTENT_LIMIT_URI; - field public static final deprecated android.net.Uri CONTENT_PHOTO_URI; - field public static final deprecated java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/stream_item"; - field public static final deprecated android.net.Uri CONTENT_URI; - field public static final deprecated java.lang.String MAX_ITEMS = "max_items"; - } - - public static final deprecated class ContactsContract.StreamItems.StreamItemPhotos implements android.provider.BaseColumns { - field public static final deprecated java.lang.String CONTENT_DIRECTORY = "photo"; - field public static final deprecated java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/stream_item_photo"; - field public static final deprecated java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/stream_item_photo"; - } - - protected static abstract deprecated interface ContactsContract.StreamItemsColumns { - field public static final deprecated java.lang.String ACCOUNT_NAME = "account_name"; - field public static final deprecated java.lang.String ACCOUNT_TYPE = "account_type"; - field public static final deprecated java.lang.String COMMENTS = "comments"; - field public static final deprecated java.lang.String CONTACT_ID = "contact_id"; - field public static final deprecated java.lang.String CONTACT_LOOKUP_KEY = "contact_lookup"; - field public static final deprecated java.lang.String DATA_SET = "data_set"; - field public static final deprecated java.lang.String RAW_CONTACT_ID = "raw_contact_id"; - field public static final deprecated java.lang.String RAW_CONTACT_SOURCE_ID = "raw_contact_source_id"; - field public static final deprecated java.lang.String RES_ICON = "icon"; - field public static final deprecated java.lang.String RES_LABEL = "label"; - field public static final deprecated java.lang.String RES_PACKAGE = "res_package"; - field public static final deprecated java.lang.String SYNC1 = "stream_item_sync1"; - field public static final deprecated java.lang.String SYNC2 = "stream_item_sync2"; - field public static final deprecated java.lang.String SYNC3 = "stream_item_sync3"; - field public static final deprecated java.lang.String SYNC4 = "stream_item_sync4"; - field public static final deprecated java.lang.String TEXT = "text"; - field public static final deprecated java.lang.String TIMESTAMP = "timestamp"; - } - public static final class Settings.System extends android.provider.Settings.NameValueTable { field public static final java.lang.String APPEND_FOR_LAST_AUDIBLE = "_last_audible"; field public static final java.lang.String VOLUME_ALARM = "volume_alarm"; diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java index 8ce1cbf43f7d5..aebe7f10d5239 100644 --- a/core/java/android/provider/ContactsContract.java +++ b/core/java/android/provider/ContactsContract.java @@ -1743,9 +1743,6 @@ public final class ContactsContract { * * @deprecated - Do not use. This will not be supported in the future. In the future, * cursors returned from related queries will be empty. - * - * @hide - * @removed */ @Deprecated public static final class StreamItems implements StreamItemsColumns { @@ -2834,9 +2831,6 @@ public final class ContactsContract { * * @deprecated - Do not use. This will not be supported in the future. In the future, * cursors returned from related queries will be empty. - * - * @hide - * @removed */ @Deprecated public static final class StreamItems implements BaseColumns, StreamItemsColumns { @@ -3273,9 +3267,6 @@ public final class ContactsContract { * * @deprecated - Do not use. This will not be supported in the future. In the future, * cursors returned from related queries will be empty. - * - * @hide - * @removed */ @Deprecated public static final class StreamItems implements BaseColumns, StreamItemsColumns { @@ -3374,9 +3365,6 @@ public final class ContactsContract { * * @deprecated - Do not use. This will not be supported in the future. In the future, * cursors returned from related queries will be empty. - * - * @hide - * @removed */ @Deprecated public static final class StreamItemPhotos @@ -3427,9 +3415,6 @@ public final class ContactsContract { * @see ContactsContract.StreamItems * @deprecated - Do not use. This will not be supported in the future. In the future, * cursors returned from related queries will be empty. - * - * @hide - * @removed */ @Deprecated protected interface StreamItemsColumns { @@ -3820,9 +3805,6 @@ public final class ContactsContract { * * @deprecated - Do not use. This will not be supported in the future. In the future, * cursors returned from related queries will be empty. - * - * @hide - * @removed */ @Deprecated public static final class StreamItemPhotos implements BaseColumns, StreamItemPhotosColumns { @@ -3861,9 +3843,6 @@ public final class ContactsContract { * @see ContactsContract.StreamItemPhotos * @deprecated - Do not use. This will not be supported in the future. In the future, * cursors returned from related queries will be empty. - * - * @hide - * @removed */ @Deprecated protected interface StreamItemPhotosColumns { diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 34f045450d990..f9b41a9324d47 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -349,6 +349,20 @@ android:description="@string/permdesc_writeContacts" android:protectionLevel="dangerous" /> + + + + + + @@ -497,6 +511,42 @@ android:description="@string/permdesc_sdcardWrite" android:protectionLevel="dangerous" /> + + + + + + + + + + + + + + + diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 0e5df50d4e14e..ea0d349ccd76a 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -553,6 +553,11 @@ access this device\'s location + + Your social information + + Direct access to information about your contacts and social connections. + Calendar @@ -896,6 +901,23 @@ Allows the app to modify your phone\'s call log, including data about incoming and outgoing calls. Malicious apps may use this to erase or modify your call log. + + + read your own contact card + + Allows the app to read + personal profile information stored on your device, such as your name and + contact information. This means the app can identify you and may send your + profile information to others. + + + modify your own contact card + + Allows the app to + change or add to personal profile information stored on your device, such + as your name and contact information. This means the app can identify you + and may send your profile information to others. + body sensors (like heart rate monitors) @@ -903,6 +925,23 @@ Allows the app to access data from sensors that monitor your physical condition, such as your heart rate. + + read your social stream + Allows the app + to access and sync social updates from you and your friends. Be careful + when sharing information -- this allows the app to read communications + between you and your friends on social networks, regardless of + confidentiality. Note: this permission may not be enforced on all social + networks. + + + write to your social stream + Allows the app to + display social updates from your friends. Be careful when sharing + information -- this allows the app to produce messages that may appear to + come from a friend. Note: this permission may not be enforced on all social + networks. + read calendar events plus confidential information diff --git a/docs/html/about/versions/android-4.0.3.jd b/docs/html/about/versions/android-4.0.3.jd index 4c2ccb96bfd3b..5fa8547eed5bd 100644 --- a/docs/html/about/versions/android-4.0.3.jd +++ b/docs/html/about/versions/android-4.0.3.jd @@ -78,19 +78,19 @@ can now sync that data with each of the user’s contacts, providing items in a stream along with photos for each.

The database table that contains an individual contact’s social stream is -defined by android.provider.ContactsContract.StreamItems, the Uri for +defined by {@link android.provider.ContactsContract.StreamItems}, the Uri for which is nested within the {@link android.provider.ContactsContract.RawContacts} directory to which the stream items belong. Each social stream table includes several columns for metadata about each stream item, such as an icon representing the source (an avatar), a label for the item, the primary text content, comments about the item (such as responses from other people), and more. Photos associated with a stream are stored in another table, defined by -android.provider.ContactsContract.StreamItemPhotos, which is available -as a sub-directory of the android.provider.ContactsContract.StreamItems +{@link android.provider.ContactsContract.StreamItemPhotos}, which is available +as a sub-directory of the {@link android.provider.ContactsContract.StreamItems} Uri.

-

See android.provider.ContactsContract.StreamItems and -android.provider.ContactsContract.StreamItemPhotos for more information.

+

See {@link android.provider.ContactsContract.StreamItems} and +{@link android.provider.ContactsContract.StreamItemPhotos} for more information.

To read or write social stream items for a contact, an application must request permission from the user by declaring <uses-permission @@ -272,8 +272,8 @@ let you check and manage video stabilization for a {@link android.hardware.Camer

The following are new permissions:

    -
  • android.Manifest.permission#READ_SOCIAL_STREAM and -android.Manifest.permission#WRITE_SOCIAL_STREAM: Allow a sync +
  • {@link android.Manifest.permission#READ_SOCIAL_STREAM} and +{@link android.Manifest.permission#WRITE_SOCIAL_STREAM}: Allow a sync adapter to read and write social stream data to a contact in the shared Contacts Provider.
diff --git a/docs/html/about/versions/android-4.0.jd b/docs/html/about/versions/android-4.0.jd index cc1d1c70d9df1..6c4ccb4c49580 100644 --- a/docs/html/about/versions/android-4.0.jd +++ b/docs/html/about/versions/android-4.0.jd @@ -108,9 +108,9 @@ android.provider.ContactsContract.RawContacts} Uri; instead, you must add a prof the table at {@link android.provider.ContactsContract.Profile#CONTENT_RAW_CONTACTS_URI}. Raw contacts in this table are then aggregated into the single user-visible profile labeled "Me".

-

Adding a new raw contact for the profile requires the -android.Manifest.permission#WRITE_PROFILE permission. Likewise, in order to read from the profile -table, you must request the android.Manifest.permission#READ_PROFILE permission. However, +

Adding a new raw contact for the profile requires the {@link +android.Manifest.permission#WRITE_PROFILE} permission. Likewise, in order to read from the profile +table, you must request the {@link android.Manifest.permission#READ_PROFILE} permission. However, most apps should not need to read the user profile, even when contributing data to the profile. Reading the user profile is a sensitive permission and you should expect users to be skeptical of apps that request it.

@@ -1638,9 +1638,9 @@ messages to the device. android.service.textservice.SpellCheckerService} must require this permission for itself.
  • {@link android.Manifest.permission#BIND_VPN_SERVICE}: A service that implements {@link android.net.VpnService} must require this permission for itself.
    • -
  • android.Manifest.permission#READ_PROFILE: Provides read access to the {@link +
  • {@link android.Manifest.permission#READ_PROFILE}: Provides read access to the {@link android.provider.ContactsContract.Profile} provider.
    • -
  • android.Manifest.permission#WRITE_PROFILE: Provides write access to the {@link +
  • {@link android.Manifest.permission#WRITE_PROFILE}: Provides write access to the {@link android.provider.ContactsContract.Profile} provider.
    • diff --git a/docs/html/guide/topics/providers/contacts-provider.jd b/docs/html/guide/topics/providers/contacts-provider.jd index 2b145585ab837..e3b998a7677fd 100644 --- a/docs/html/guide/topics/providers/contacts-provider.jd +++ b/docs/html/guide/topics/providers/contacts-provider.jd @@ -57,7 +57,7 @@ page.title=Contacts Provider
  • {@link android.provider.ContactsContract.Contacts}
  • {@link android.provider.ContactsContract.RawContacts}
  • {@link android.provider.ContactsContract.Data}
    • -
  • android.provider.ContactsContract.StreamItems
    • +
  • {@link android.provider.ContactsContract.StreamItems}

    • Related Samples

      @@ -606,13 +606,13 @@ page.title=Contacts Provider Access to the user profile requires special permissions. In addition to the {@link android.Manifest.permission#READ_CONTACTS} and {@link android.Manifest.permission#WRITE_CONTACTS} permissions needed to read and write, access - to the user profile requires the android.Manifest.permission#READ_PROFILE and - android.Manifest.permission#WRITE_PROFILE permissions for read and write access, + to the user profile requires the {@link android.Manifest.permission#READ_PROFILE} and + {@link android.Manifest.permission#WRITE_PROFILE} permissions for read and write access, respectively.

      Remember that you should consider a user's profile to be sensitive. The permission - android.Manifest.permission#READ_PROFILE allows you to access the device user's + {@link android.Manifest.permission#READ_PROFILE} allows you to access the device user's personally-identifying data. Make sure to tell the user why you need user profile access permissions in the description of your application.

      @@ -1826,8 +1826,8 @@ child elements that provide specific data to the

      Social Stream Data

      - The android.provider.ContactsContract.StreamItems and - android.provider.ContactsContract.StreamItemPhotos tables + The {@link android.provider.ContactsContract.StreamItems} and + {@link android.provider.ContactsContract.StreamItemPhotos} tables manage incoming data from social networks. You can write a sync adapter that adds stream data from your own network to these tables, or you can read stream data from these tables and display it in your own application, or both. With these features, your social networking @@ -1836,7 +1836,7 @@ child elements that provide specific data to the

      Social stream text

      Stream items are always associated with a raw contact. The - android.provider.ContactsContract.StreamItemsColumns#RAW_CONTACT_ID links to the + {@link android.provider.ContactsContract.StreamItemsColumns#RAW_CONTACT_ID} links to the _ID value for the raw contact. The account type and account name of the raw contact are also stored in the stream item row.

      @@ -1845,14 +1845,14 @@ child elements that provide specific data to the

      - android.provider.ContactsContract.StreamItemsColumns#ACCOUNT_TYPE + {@link android.provider.ContactsContract.StreamItemsColumns#ACCOUNT_TYPE}
      Required. The user's account type for the raw contact associated with this stream item. Remember to set this value when you insert a stream item.
      - android.provider.ContactsContract.StreamItemsColumns#ACCOUNT_NAME + {@link android.provider.ContactsContract.StreamItemsColumns#ACCOUNT_NAME}
      Required. The user's account name for the raw contact associated with this @@ -1866,30 +1866,30 @@ child elements that provide specific data to the insert a stream item:
      • - android.provider.ContactsContract.StreamItemsColumns#CONTACT_ID: The - android.provider.BaseColumns#_ID value of the contact that this stream + {@link android.provider.ContactsContract.StreamItemsColumns#CONTACT_ID}: The + {@link android.provider.BaseColumns#_ID} value of the contact that this stream item is associated with.
      • - android.provider.ContactsContract.StreamItemsColumns#CONTACT_LOOKUP_KEY: The - android.provider.ContactsContract.ContactsColumns#LOOKUP_KEY value of the + {@link android.provider.ContactsContract.StreamItemsColumns#CONTACT_LOOKUP_KEY}: The + {@link android.provider.ContactsContract.ContactsColumns#LOOKUP_KEY} value of the contact this stream item is associated with.
      • - android.provider.ContactsContract.StreamItemsColumns#RAW_CONTACT_ID: The - android.provider.BaseColumns#_ID value of the raw contact that this stream + {@link android.provider.ContactsContract.StreamItemsColumns#RAW_CONTACT_ID}: The + {@link android.provider.BaseColumns#_ID} value of the raw contact that this stream item is associated with.
      - android.provider.ContactsContract.StreamItemsColumns#COMMENTS + {@link android.provider.ContactsContract.StreamItemsColumns#COMMENTS}
      Optional. Stores summary information that you can display at the beginning of a stream item.
      - android.provider.ContactsContract.StreamItemsColumns#TEXT + {@link android.provider.ContactsContract.StreamItemsColumns#TEXT}
      The text of the stream item, either the content that was posted by the source of the item, @@ -1899,7 +1899,7 @@ child elements that provide specific data to the ellipsize long content, but it will try to avoid breaking tags.
      - android.provider.ContactsContract.StreamItemsColumns#TIMESTAMP + {@link android.provider.ContactsContract.StreamItemsColumns#TIMESTAMP}
      A text string containing the time the stream item was inserted or updated, in the form @@ -1910,42 +1910,42 @@ child elements that provide specific data to the

      To display identifying information for your stream items, use the - android.provider.ContactsContract.StreamItemsColumns#RES_ICON, - android.provider.ContactsContract.StreamItemsColumns#RES_LABEL, and - android.provider.ContactsContract.StreamItemsColumns#RES_PACKAGE to link to resources + {@link android.provider.ContactsContract.StreamItemsColumns#RES_ICON}, + {@link android.provider.ContactsContract.StreamItemsColumns#RES_LABEL}, and + {@link android.provider.ContactsContract.StreamItemsColumns#RES_PACKAGE} to link to resources in your application.

      - The android.provider.ContactsContract.StreamItems table also contains the columns - android.provider.ContactsContract.StreamItemsColumns#SYNC1 through - android.provider.ContactsContract.StreamItemsColumns#SYNC4 for the exclusive use of + The {@link android.provider.ContactsContract.StreamItems} table also contains the columns + {@link android.provider.ContactsContract.StreamItemsColumns#SYNC1} through + {@link android.provider.ContactsContract.StreamItemsColumns#SYNC4} for the exclusive use of sync adapters.

      Social stream photos

      - The android.provider.ContactsContract.StreamItemPhotos table stores photos associated + The {@link android.provider.ContactsContract.StreamItemPhotos} table stores photos associated with a stream item. The table's - android.provider.ContactsContract.StreamItemPhotosColumns#STREAM_ITEM_ID column + {@link android.provider.ContactsContract.StreamItemPhotosColumns#STREAM_ITEM_ID} column links to values in the {@link android.provider.BaseColumns#_ID} column of - android.provider.ContactsContract.StreamItems table. Photo references are stored in the + {@link android.provider.ContactsContract.StreamItems} table. Photo references are stored in the table in these columns:

      - android.provider.ContactsContract.StreamItemPhotos#PHOTO column (a BLOB). + {@link android.provider.ContactsContract.StreamItemPhotos#PHOTO} column (a BLOB).
      A binary representation of the photo, resized by the provider for storage and display. This column is available for backwards compatibility with previous versions of the Contacts Provider that used it for storing photos. However, in the current version you should not use this column to store photos. Instead, use - either android.provider.ContactsContract.StreamItemPhotosColumns#PHOTO_FILE_ID or - android.provider.ContactsContract.StreamItemPhotosColumns#PHOTO_URI (both of + either {@link android.provider.ContactsContract.StreamItemPhotosColumns#PHOTO_FILE_ID} or + {@link android.provider.ContactsContract.StreamItemPhotosColumns#PHOTO_URI} (both of which are described in the following points) to store photos in a file. This column now contains a thumbnail of the photo, which is available for reading.
      - android.provider.ContactsContract.StreamItemPhotosColumns#PHOTO_FILE_ID + {@link android.provider.ContactsContract.StreamItemPhotosColumns#PHOTO_FILE_ID}
      A numeric identifier of a photo for a raw contact. Append this value to the constant @@ -1955,7 +1955,7 @@ child elements that provide specific data to the openAssetFileDescriptor()} to get a handle to the photo file.
      - android.provider.ContactsContract.StreamItemPhotosColumns#PHOTO_URI + {@link android.provider.ContactsContract.StreamItemPhotosColumns#PHOTO_URI}
      A content URI pointing directly to the photo file for the photo represented by this row. @@ -1970,27 +1970,27 @@ child elements that provide specific data to the
      • These tables require additional access permissions. To read from them, your application - must have the permission android.Manifest.permission#READ_SOCIAL_STREAM. To + must have the permission {@link android.Manifest.permission#READ_SOCIAL_STREAM}. To modify them, your application must have the permission - android.Manifest.permission#WRITE_SOCIAL_STREAM. + {@link android.Manifest.permission#WRITE_SOCIAL_STREAM}.
      • - For the android.provider.ContactsContract.StreamItems table, the number of rows + For the {@link android.provider.ContactsContract.StreamItems} table, the number of rows stored for each raw contact is limited. Once this limit is reached, the Contacts Provider makes space for new stream item rows by automatically deleting the rows having the oldest - android.provider.ContactsContract.StreamItemsColumns#TIMESTAMP. To get the + {@link android.provider.ContactsContract.StreamItemsColumns#TIMESTAMP}. To get the limit, issue a query to the content URI - android.provider.ContactsContract.StreamItems#CONTENT_LIMIT_URI. You can leave + {@link android.provider.ContactsContract.StreamItems#CONTENT_LIMIT_URI}. You can leave all the arguments other than the content URI set to null. The query returns a Cursor containing a single row, with the single column - android.provider.ContactsContract.StreamItems#MAX_ITEMS. + {@link android.provider.ContactsContract.StreamItems#MAX_ITEMS}.

      - The class android.provider.ContactsContract.StreamItems.StreamItemPhotos defines a - sub-table of android.provider.ContactsContract.StreamItemPhotos containing the photo + The class {@link android.provider.ContactsContract.StreamItems.StreamItemPhotos} defines a + sub-table of {@link android.provider.ContactsContract.StreamItemPhotos} containing the photo rows for a single stream item.

      Social stream interactions

      @@ -2003,8 +2003,8 @@ child elements that provide specific data to the
    1. By syncing your social networking service to the Contacts Provider with a sync adapter, you can retrieve recent activity for a user's contacts and store it in - the android.provider.ContactsContract.StreamItems and - android.provider.ContactsContract.StreamItemPhotos tables for later use. + the {@link android.provider.ContactsContract.StreamItems} and + {@link android.provider.ContactsContract.StreamItemPhotos} tables for later use.
    2. Besides regular synchronization, you can trigger your sync adapter to retrieve @@ -2356,6 +2356,6 @@ child elements that provide specific data to the

      Social stream data for a person may also include photos. These are stored in the - android.provider.ContactsContract.StreamItemPhotos table, which is described in more + {@link android.provider.ContactsContract.StreamItemPhotos} table, which is described in more detail in the section Social stream photos.

      diff --git a/services/core/java/com/android/server/LockSettingsService.java b/services/core/java/com/android/server/LockSettingsService.java index c5ea8bc1dbc67..5436ce020abcf 100644 --- a/services/core/java/com/android/server/LockSettingsService.java +++ b/services/core/java/com/android/server/LockSettingsService.java @@ -27,10 +27,11 @@ import android.content.pm.PackageManager; import android.content.pm.UserInfo; import static android.Manifest.permission.ACCESS_KEYGUARD_SECURE_STORAGE; import static android.content.Context.USER_SERVICE; -import static android.Manifest.permission.READ_CONTACTS; +import static android.Manifest.permission.READ_PROFILE; import android.database.sqlite.SQLiteDatabase; import android.os.Binder; import android.os.IBinder; +import android.os.Process; import android.os.RemoteException; import android.os.storage.IMountService; import android.os.ServiceManager; @@ -263,12 +264,12 @@ public class LockSettingsService extends ILockSettings.Stub { private final void checkReadPermission(String requestedKey, int userId) { final int callingUid = Binder.getCallingUid(); - for (int i = 0; i < READ_CONTACTS_PROTECTED_SETTINGS.length; i++) { - String key = READ_CONTACTS_PROTECTED_SETTINGS[i]; - if (key.equals(requestedKey) && mContext.checkCallingOrSelfPermission(READ_CONTACTS) + for (int i = 0; i < READ_PROFILE_PROTECTED_SETTINGS.length; i++) { + String key = READ_PROFILE_PROTECTED_SETTINGS[i]; + if (key.equals(requestedKey) && mContext.checkCallingOrSelfPermission(READ_PROFILE) != PackageManager.PERMISSION_GRANTED) { throw new SecurityException("uid=" + callingUid - + " needs permission " + READ_CONTACTS + " to read " + + " needs permission " + READ_PROFILE + " to read " + requestedKey + " for user " + userId); } } @@ -721,8 +722,8 @@ public class LockSettingsService extends ILockSettings.Stub { Secure.LOCK_PATTERN_TACTILE_FEEDBACK_ENABLED }; - // Reading these settings needs the contacts permission - private static final String[] READ_CONTACTS_PROTECTED_SETTINGS = new String[] { + // Reading these settings needs the profile permission + private static final String[] READ_PROFILE_PROTECTED_SETTINGS = new String[] { Secure.LOCK_SCREEN_OWNER_INFO_ENABLED, Secure.LOCK_SCREEN_OWNER_INFO };