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

Commit 465099ce authored by Makoto Onuki's avatar Makoto Onuki Committed by Android (Google) Code Review
Browse files

Merge "API change for: Revive CONTACTS_DATABASE_CREATED, and..."

parents 4a0ae490 2a61537b

api/current.txt

+1 −2
Original line number Diff line number Diff line
@@ -32965,7 +32965,7 @@ package android.provider { 
    ctor public ContactsContract.Intents();

    field public static final java.lang.String ACTION_VOICE_SEND_MESSAGE_TO_CONTACTS = "android.provider.action.VOICE_SEND_MESSAGE_TO_CONTACTS";

    field public static final java.lang.String ATTACH_IMAGE = "com.android.contacts.action.ATTACH_IMAGE";

    field public static final deprecated java.lang.String CONTACTS_DATABASE_CREATED = "android.provider.Contacts.DATABASE_CREATED";

    field public static final java.lang.String CONTACTS_DATABASE_CREATED = "android.provider.Contacts.DATABASE_CREATED";

    field public static final java.lang.String EXTRA_CREATE_DESCRIPTION = "com.android.contacts.action.CREATE_DESCRIPTION";

    field public static final java.lang.String EXTRA_FORCE_CREATE = "com.android.contacts.action.FORCE_CREATE";

    field public static final java.lang.String EXTRA_RECIPIENT_CONTACT_CHAT_ID = "android.provider.extra.RECIPIENT_CONTACT_CHAT_ID";
@@ -33078,7 +33078,6 @@ package android.provider { 
    field public static final java.lang.String DATABASE_CREATION_TIMESTAMP = "database_creation_timestamp";

    field public static final java.lang.String STATUS = "status";

    field public static final int STATUS_BUSY = 1; // 0x1

    field public static final android.net.Uri STATUS_CHANGE_NOTIFICATION_CONTENT_URI;

    field public static final int STATUS_EMPTY = 2; // 0x2

    field public static final int STATUS_NORMAL = 0; // 0x0

  }

api/system-current.txt

+1 −2
Original line number Diff line number Diff line
@@ -35835,7 +35835,7 @@ package android.provider { 
    ctor public ContactsContract.Intents();

    field public static final java.lang.String ACTION_VOICE_SEND_MESSAGE_TO_CONTACTS = "android.provider.action.VOICE_SEND_MESSAGE_TO_CONTACTS";

    field public static final java.lang.String ATTACH_IMAGE = "com.android.contacts.action.ATTACH_IMAGE";

    field public static final deprecated java.lang.String CONTACTS_DATABASE_CREATED = "android.provider.Contacts.DATABASE_CREATED";

    field public static final java.lang.String CONTACTS_DATABASE_CREATED = "android.provider.Contacts.DATABASE_CREATED";

    field public static final java.lang.String EXTRA_CREATE_DESCRIPTION = "com.android.contacts.action.CREATE_DESCRIPTION";

    field public static final java.lang.String EXTRA_FORCE_CREATE = "com.android.contacts.action.FORCE_CREATE";

    field public static final java.lang.String EXTRA_RECIPIENT_CONTACT_CHAT_ID = "android.provider.extra.RECIPIENT_CONTACT_CHAT_ID";
@@ -35978,7 +35978,6 @@ package android.provider { 
    field public static final java.lang.String DATABASE_CREATION_TIMESTAMP = "database_creation_timestamp";

    field public static final java.lang.String STATUS = "status";

    field public static final int STATUS_BUSY = 1; // 0x1

    field public static final android.net.Uri STATUS_CHANGE_NOTIFICATION_CONTENT_URI;

    field public static final int STATUS_EMPTY = 2; // 0x2

    field public static final int STATUS_NORMAL = 0; // 0x0

  }

api/test-current.txt

+1 −2
Original line number Diff line number Diff line
@@ -33083,7 +33083,7 @@ package android.provider { 
    ctor public ContactsContract.Intents();

    field public static final java.lang.String ACTION_VOICE_SEND_MESSAGE_TO_CONTACTS = "android.provider.action.VOICE_SEND_MESSAGE_TO_CONTACTS";

    field public static final java.lang.String ATTACH_IMAGE = "com.android.contacts.action.ATTACH_IMAGE";

    field public static final deprecated java.lang.String CONTACTS_DATABASE_CREATED = "android.provider.Contacts.DATABASE_CREATED";

    field public static final java.lang.String CONTACTS_DATABASE_CREATED = "android.provider.Contacts.DATABASE_CREATED";

    field public static final java.lang.String EXTRA_CREATE_DESCRIPTION = "com.android.contacts.action.CREATE_DESCRIPTION";

    field public static final java.lang.String EXTRA_FORCE_CREATE = "com.android.contacts.action.FORCE_CREATE";

    field public static final java.lang.String EXTRA_RECIPIENT_CONTACT_CHAT_ID = "android.provider.extra.RECIPIENT_CONTACT_CHAT_ID";
@@ -33196,7 +33196,6 @@ package android.provider { 
    field public static final java.lang.String DATABASE_CREATION_TIMESTAMP = "database_creation_timestamp";

    field public static final java.lang.String STATUS = "status";

    field public static final int STATUS_BUSY = 1; // 0x1

    field public static final android.net.Uri STATUS_CHANGE_NOTIFICATION_CONTENT_URI;

    field public static final int STATUS_EMPTY = 2; // 0x2

    field public static final int STATUS_NORMAL = 0; // 0x0

  }

core/java/android/provider/ContactsContract.java

+8 −24
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package android.provider; 
import android.accounts.Account;

import android.annotation.SystemApi;

import android.app.Activity;

import android.content.BroadcastReceiver;

import android.content.ContentProviderClient;

import android.content.ContentProviderOperation;

import android.content.ContentResolver;
@@ -30,6 +31,7 @@ import android.content.CursorEntityIterator; 
import android.content.Entity;

import android.content.EntityIterator;

import android.content.Intent;

import android.content.IntentFilter;

import android.content.res.AssetFileDescriptor;

import android.content.res.Resources;

import android.database.Cursor;
@@ -8170,28 +8172,10 @@ public final class ContactsContract { 
        /**

         * The content:// style URI for this table.  Requests to this URI can be

         * performed on the UI thread because they are always unblocking.

         *

         * <p>Note when you listen on this URI (or any other sub-URIs), you'll be notified for

         * regular contact change notifications too, which will be sent on the root URI.

         * If you only want to be notified for provider status change notifications, listen on

         * {@link #STATUS_CHANGE_NOTIFICATION_CONTENT_URI} instead.

         */

        public static final Uri CONTENT_URI =

                Uri.withAppendedPath(AUTHORITY_URI, "provider_status");



        /**

         * URI to listen to provider status changes without listening to regular

         * contact changes.  If a client only wants to monitor {@link ProviderStatus} with

         * {@link android.app.job.JobScheduler}, then this URI should be used instead of

         * {@link #CONTENT_URI}, because a job on {@link #CONTENT_URI} will also be invoked

         * when contacts are changed.

         *

         * <p>Note this URI cannot be queried.  A query should be always made on

         * {@link #CONTENT_URI}.

         */

        public static final Uri STATUS_CHANGE_NOTIFICATION_CONTENT_URI =

                Uri.parse("content://com.android.contacts.provider_status");



        /**

         * The MIME-type of {@link #CONTENT_URI} providing a directory of

         * settings.
@@ -8794,13 +8778,13 @@ public final class ContactsContract { 
         * This is the intent that is fired when the contacts database is created. <p> The

         * READ_CONTACT permission is required to receive these broadcasts.

         *

         * <p>As of O, this broadcast will no longer be sent.  Applications can use

         * use {@link android.app.job.JobScheduler} to monitor

         * {@link ProviderStatus#STATUS_CHANGE_NOTIFICATION_CONTENT_URI}, and read

         * {@link ProviderStatus#DATABASE_CREATION_TIMESTAMP} to get when

         * the contacts database was initialized.

         * <p>Because this is an implicit broadcast, apps targeting Android O will no longer

         * receive this broadcast via a manifest broadcast receiver.  (Broadcast receivers

         * registered at runtime with

         * {@link Context#registerReceiver(BroadcastReceiver, IntentFilter)} will still receive it.)

         * Instead, an app can use {@link ProviderStatus#DATABASE_CREATION_TIMESTAMP} to see if the

         * contacts database has been initialized when it starts.

         */

        @Deprecated

        public static final String CONTACTS_DATABASE_CREATED =

                "android.provider.Contacts.DATABASE_CREATED";