summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--api/current.xml15
-rw-r--r--core/java/android/content/ContentResolver.java4
-rw-r--r--core/java/android/content/SyncAdapterType.java1
3 files changed, 16 insertions, 4 deletions
diff --git a/api/current.xml b/api/current.xml
index 8fab662..461fc38 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -27037,7 +27037,7 @@
abstract="false"
native="false"
synchronized="false"
- static="false"
+ static="true"
final="false"
deprecated="not deprecated"
visibility="public"
@@ -27349,7 +27349,7 @@
abstract="false"
native="false"
synchronized="false"
- static="false"
+ static="true"
final="false"
deprecated="not deprecated"
visibility="public"
@@ -35797,6 +35797,17 @@
visibility="public"
>
</field>
+<field name="isUserFacing"
+ type="boolean"
+ transient="false"
+ volatile="false"
+ value="true"
+ static="false"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
</class>
<interface name="SyncStatusObserver"
abstract="true"
diff --git a/core/java/android/content/ContentResolver.java b/core/java/android/content/ContentResolver.java
index 94b6162..bf1a442 100644
--- a/core/java/android/content/ContentResolver.java
+++ b/core/java/android/content/ContentResolver.java
@@ -1015,7 +1015,7 @@ public abstract class ContentResolver {
* Check if this account/provider is syncable.
* @return >0 if it is syncable, 0 if not, and <0 if the state isn't known yet.
*/
- public int getIsSyncable(Account account, String authority) {
+ public static int getIsSyncable(Account account, String authority) {
try {
return getContentService().getIsSyncable(account, authority);
} catch (RemoteException e) {
@@ -1027,7 +1027,7 @@ public abstract class ContentResolver {
* Set whether this account/provider is syncable.
* @param syncable >0 denotes syncable, 0 means not syncable, <0 means unknown
*/
- public void setIsSyncable(Account account, String authority, int syncable) {
+ public static void setIsSyncable(Account account, String authority, int syncable) {
try {
getContentService().setIsSyncable(account, authority, syncable);
} catch (RemoteException e) {
diff --git a/core/java/android/content/SyncAdapterType.java b/core/java/android/content/SyncAdapterType.java
index 5a96003..d3f8230 100644
--- a/core/java/android/content/SyncAdapterType.java
+++ b/core/java/android/content/SyncAdapterType.java
@@ -27,6 +27,7 @@ import android.os.Parcel;
public class SyncAdapterType implements Parcelable {
public final String authority;
public final String accountType;
+ public final boolean isUserFacing = true; // TODO: implement logic to set this
public SyncAdapterType(String authority, String accountType) {
if (TextUtils.isEmpty(authority)) {