make syncadapter set whether the account is syncable

1 files changed, 13 insertions, 4 deletions

diff --git a/core/java/android/content/SyncAdapterType.java b/core/java/android/content/SyncAdapterType.java
index d3f8230..93b61ec 100644
--- a/core/java/android/content/SyncAdapterType.java
+++ b/core/java/android/content/SyncAdapterType.java
@@ -27,9 +27,9 @@ 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 final boolean userVisible;
 
-    public SyncAdapterType(String authority, String accountType) {
+    public SyncAdapterType(String authority, String accountType, boolean userVisible) {
         if (TextUtils.isEmpty(authority)) {
             throw new IllegalArgumentException("the authority must not be empty: " + authority);
         }
@@ -38,12 +38,18 @@ public class SyncAdapterType implements Parcelable {
         }
         this.authority = authority;
         this.accountType = accountType;
+        this.userVisible = userVisible;
+    }
+
+    public static SyncAdapterType newKey(String authority, String accountType) {
+        return new SyncAdapterType(authority, accountType, true);
     }
 
     public boolean equals(Object o) {
         if (o == this) return true;
         if (!(o instanceof SyncAdapterType)) return false;
         final SyncAdapterType other = (SyncAdapterType)o;
+        // don't include userVisible in the equality check
         return authority.equals(other.authority) && accountType.equals(other.accountType);
     }
 
@@ -51,11 +57,13 @@ public class SyncAdapterType implements Parcelable {
         int result = 17;
         result = 31 * result + authority.hashCode();
         result = 31 * result + accountType.hashCode();
+        // don't include userVisible in the hash
         return result;
     }
 
     public String toString() {
-        return "SyncAdapterType {name=" + authority + ", type=" + accountType + "}";
+        return "SyncAdapterType {name=" + authority + ", type=" + accountType
+                + ", userVisible=" + userVisible + "}";
     }
 
     public int describeContents() {
@@ -65,10 +73,11 @@ public class SyncAdapterType implements Parcelable {
     public void writeToParcel(Parcel dest, int flags) {
         dest.writeString(authority);
         dest.writeString(accountType);
+        dest.writeInt(userVisible ? 1 : 0);
     }
 
     public SyncAdapterType(Parcel source) {
-        this(source.readString(), source.readString());
+        this(source.readString(), source.readString(), source.readInt() != 0);
     }
 
     public static final Creator<SyncAdapterType> CREATOR = new Creator<SyncAdapterType>() {