Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 03c818b5: am b36ad5dc: Decouple ProviderStatus & internal provider state

Browse Source 
* commit '03c818b575c9f4481fee3ceaf21ac07540a69619':
  Decouple ProviderStatus & internal provider state
This commit is contained in:
Brian Attwell
2015-06-02 21:16:41 +00:00
committed by Android Git Automerger
parent caf62ab9b9 03c818b575
commit 6b37b0df11
3 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
api/current.txt
View File

@@ -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[]);

9
api/system-current.txt
View File

@@ -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[]);

15
core/java/android/provider/ContactsContract.java
View File

@@ -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.
* 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_UPGRADING = 1;
/**
* The status used during a 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;
}
/**