Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 891f5b26 authored by Brian Attwell's avatar Brian Attwell Committed by Android (Google) Code Review
Browse files

Merge "Mark social APIs stream APIs as deprecated" into lmp-dev

parents 286b06ae bdb13c8c

api/current.txt

+48 −48
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ package android { 
    field public static final java.lang.String READ_PHONE_STATE = "android.permission.READ_PHONE_STATE";

    field public static final 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 java.lang.String READ_SOCIAL_STREAM = "android.permission.READ_SOCIAL_STREAM";

    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";
@@ -157,7 +157,7 @@ package android { 
    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 java.lang.String WRITE_SMS = "android.permission.WRITE_SMS";

    field public static final java.lang.String WRITE_SOCIAL_STREAM = "android.permission.WRITE_SOCIAL_STREAM";

    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";

  }
@@ -24270,8 +24270,8 @@ package android.provider { 
    field public static final java.lang.String PHOTO_FILE_ID = "data14";

  }













  public static final class ContactsContract.Contacts.StreamItems implements android.provider.ContactsContract.StreamItemsColumns {













    field public static final java.lang.String CONTENT_DIRECTORY = "stream_items";













  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 {










@@ -24567,8 +24567,8 @@ package android.provider {













    field public static final java.lang.String DATA_ID = "data_id";















  }



























  public static final class ContactsContract.RawContacts.StreamItems implements android.provider.BaseColumns android.provider.ContactsContract.StreamItemsColumns {













    field public static final java.lang.String CONTENT_DIRECTORY = "stream_items";













  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 {










@@ -24642,54 +24642,54 @@ package android.provider {













    field public static final android.net.Uri PROFILE_CONTENT_URI;















  }



























  public static final class ContactsContract.StreamItemPhotos implements android.provider.BaseColumns android.provider.ContactsContract.StreamItemPhotosColumns {













    field public static final java.lang.String PHOTO = "photo";













  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 interface ContactsContract.StreamItemPhotosColumns {













    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";













    field public static final java.lang.String SYNC1 = "stream_item_photo_sync1";













    field public static final java.lang.String SYNC2 = "stream_item_photo_sync2";













    field public static final java.lang.String SYNC3 = "stream_item_photo_sync3";













    field public static final java.lang.String SYNC4 = "stream_item_photo_sync4";













  }

























  public static final class ContactsContract.StreamItems implements android.provider.BaseColumns android.provider.ContactsContract.StreamItemsColumns {













    field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/stream_item";













    field public static final android.net.Uri CONTENT_LIMIT_URI;













    field public static final android.net.Uri CONTENT_PHOTO_URI;













    field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/stream_item";













    field public static final android.net.Uri CONTENT_URI;













    field public static final java.lang.String MAX_ITEMS = "max_items";













  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 class ContactsContract.StreamItems.StreamItemPhotos implements android.provider.BaseColumns android.provider.ContactsContract.StreamItemPhotosColumns {













    field public static final java.lang.String CONTENT_DIRECTORY = "photo";













    field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/stream_item_photo";













    field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/stream_item_photo";













  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";















  }



























  protected static abstract interface ContactsContract.StreamItemsColumns {













    field public static final java.lang.String ACCOUNT_NAME = "account_name";













    field public static final java.lang.String ACCOUNT_TYPE = "account_type";













    field public static final java.lang.String COMMENTS = "comments";













    field public static final java.lang.String CONTACT_ID = "contact_id";













    field public static final java.lang.String CONTACT_LOOKUP_KEY = "contact_lookup";













    field public static final java.lang.String DATA_SET = "data_set";













    field public static final java.lang.String RAW_CONTACT_ID = "raw_contact_id";













    field public static final java.lang.String RAW_CONTACT_SOURCE_ID = "raw_contact_source_id";













    field public static final java.lang.String RES_ICON = "icon";













    field public static final java.lang.String RES_LABEL = "label";













    field public static final java.lang.String RES_PACKAGE = "res_package";













    field public static final java.lang.String SYNC1 = "stream_item_sync1";













    field public static final java.lang.String SYNC2 = "stream_item_sync2";













    field public static final java.lang.String SYNC3 = "stream_item_sync3";













    field public static final java.lang.String SYNC4 = "stream_item_sync4";













    field public static final java.lang.String TEXT = "text";













    field public static final java.lang.String TIMESTAMP = "timestamp";













  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 {

























core/java/android/provider/ContactsContract.java



+218
−8


























File changed.
Preview size limit exceeded, changes collapsed.
























core/res/AndroidManifest.xml



+6
−2




























Original line number
Diff line number
Diff line








@@ -481,7 +481,9 @@













        android:label="@string/permlab_writeCallLog"















        android:description="@string/permdesc_writeCallLog" />





























  <!-- Allows an application to read from the user's social stream. -->













  <!-- Allows an application to read from the user's social stream.













       @deprecated This functionality will be unsupported in the future; cursors returned













       will be empty. Please do not use. -->















    <permission android:name="android.permission.READ_SOCIAL_STREAM"















        android:permissionGroup="android.permission-group.SOCIAL_INFO"















        android:protectionLevel="dangerous"









@@ -489,7 +491,9 @@













        android:description="@string/permdesc_readSocialStream" />































    <!-- Allows an application to write (but not read) the user's













         social stream data. -->













         social stream data.













         @deprecated This functionality will be unsupported in the future; cursors returned













         will be empty. Please do not use. -->















    <permission android:name="android.permission.WRITE_SOCIAL_STREAM"















        android:permissionGroup="android.permission-group.SOCIAL_INFO"















        android:protectionLevel="dangerous"