diff options
| author | Brian Attwell <brianattwell@google.com> | 2015-05-28 19:25:21 -0700 |
|---|---|---|
| committer | Brian Attwell <brianattwell@google.com> | 2015-06-02 20:56:27 +0000 |
| commit | b36ad5dc6bb6218aeabca17197001ac0a942219a (patch) | |
| tree | 519170f43b73fe6d54fbb2006ebc8c8a6a153a33 | |
| parent | 56dbe3ee4bea8fce11a2698a44778e264e9ec2db (diff) | |
| download | frameworks_base-b36ad5dc6bb6218aeabca17197001ac0a942219a.zip frameworks_base-b36ad5dc6bb6218aeabca17197001ac0a942219a.tar.gz frameworks_base-b36ad5dc6bb6218aeabca17197001ac0a942219a.tar.bz2 | |
Decouple ProviderStatus & internal provider state
Bug: 21090207
Change-Id: I7e93e36ad0c0d667ac56983c76acb1b97bd8755c
| -rw-r--r-- | api/current.txt | 9 | ||||
| -rw-r--r-- | api/system-current.txt | 9 | ||||
| -rw-r--r-- | core/java/android/provider/ContactsContract.java | 15 |
3 files changed, 22 insertions, 11 deletions
diff --git a/api/current.txt b/api/current.txt index 8563b92..8e08df9 100644 --- a/api/current.txt +++ b/api/current.txt @@ -25841,6 +25841,15 @@ package android.provider { field public static final android.net.Uri CONTENT_URI; } + public static final class ContactsContract.ProviderStatus { + field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/provider_status"; + field public static final android.net.Uri CONTENT_URI; + field public static final java.lang.String STATUS = "status"; + field public static final int STATUS_BUSY = 1; // 0x1 + field public static final int STATUS_EMPTY = 2; // 0x2 + field public static final int STATUS_NORMAL = 0; // 0x0 + } + public static final class ContactsContract.QuickContact { ctor public ContactsContract.QuickContact(); method public static void showQuickContact(android.content.Context, android.view.View, android.net.Uri, int, java.lang.String[]); diff --git a/api/system-current.txt b/api/system-current.txt index 45f97c6..e3f6699 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -27770,6 +27770,15 @@ package android.provider { field public static final android.net.Uri CONTENT_URI; } + public static final class ContactsContract.ProviderStatus { + field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/provider_status"; + field public static final android.net.Uri CONTENT_URI; + field public static final java.lang.String STATUS = "status"; + field public static final int STATUS_BUSY = 1; // 0x1 + field public static final int STATUS_EMPTY = 2; // 0x2 + field public static final int STATUS_NORMAL = 0; // 0x0 + } + public static final class ContactsContract.QuickContact { ctor public ContactsContract.QuickContact(); method public static void showQuickContact(android.content.Context, android.view.View, android.net.Uri, int, java.lang.String[]); diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java index 76a5f967..df2e5f9 100644 --- a/core/java/android/provider/ContactsContract.java +++ b/core/java/android/provider/ContactsContract.java @@ -7930,8 +7930,6 @@ public final class ContactsContract { /** * API for inquiring about the general status of the provider. - * - * @hide */ public static final class ProviderStatus { @@ -7965,21 +7963,16 @@ public final class ContactsContract { public static final int STATUS_NORMAL = 0; /** - * The status used when the provider is in the process of upgrading. Contacts - * are temporarily unaccessible. - */ - public static final int STATUS_UPGRADING = 1; - - /** - * The status used during a locale change. + * The provider won't respond to queries. It is in the middle of a long running task, such + * as a database upgrade or locale change. */ - public static final int STATUS_CHANGING_LOCALE = 3; + public static final int STATUS_BUSY = 1; /** * The status that indicates that there are no accounts and no contacts * on the device. */ - public static final int STATUS_NO_ACCOUNTS_NO_CONTACTS = 4; + public static final int STATUS_EMPTY = 2; } /** |