diff options
| author | Fred Quintana <fredq@google.com> | 2010-12-09 16:02:06 -0800 |
|---|---|---|
| committer | Fred Quintana <fredq@google.com> | 2010-12-09 16:26:18 -0800 |
| commit | 957d85ec046651a8b0549b62021079ddcc0b8f53 (patch) | |
| tree | 6fb297aa81fd7beec05d811fa96efac3a26a3133 | |
| parent | 37f74cad46c6f1799aec3c52e8f47598237f43d4 (diff) | |
| download | frameworks_base-957d85ec046651a8b0549b62021079ddcc0b8f53.zip frameworks_base-957d85ec046651a8b0549b62021079ddcc0b8f53.tar.gz frameworks_base-957d85ec046651a8b0549b62021079ddcc0b8f53.tar.bz2 | |
revert an API change that conflicted witha previous SDK version
Change-Id: I71ef6bd135296846021c0e7ee465cac9181b5473
| -rw-r--r-- | api/current.xml | 22 | ||||
| -rw-r--r-- | core/java/android/content/SyncAdapterType.java | 1 |
2 files changed, 19 insertions, 4 deletions
diff --git a/api/current.xml b/api/current.xml index 36d1699..249f584 100644 --- a/api/current.xml +++ b/api/current.xml @@ -55478,6 +55478,22 @@ deprecated="not deprecated" visibility="public" > +<parameter name="authority" type="java.lang.String"> +</parameter> +<parameter name="accountType" type="java.lang.String"> +</parameter> +<parameter name="userVisible" type="boolean"> +</parameter> +<parameter name="supportsUploading" type="boolean"> +</parameter> +</constructor> +<constructor name="SyncAdapterType" + type="android.content.SyncAdapterType" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> <parameter name="source" type="android.os.Parcel"> </parameter> </constructor> @@ -250590,7 +250606,7 @@ deprecated="not deprecated" visibility="public" > -<parameter name="t" type="T"> +<parameter name="arg0" type="T"> </parameter> </method> </interface> @@ -259269,7 +259285,7 @@ deprecated="not deprecated" visibility="public" > -<parameter name="toSkip" type="long"> +<parameter name="byteCount" type="long"> </parameter> <exception name="IOException" type="java.io.IOException"> </exception> @@ -263827,7 +263843,7 @@ deprecated="not deprecated" visibility="public" > -<parameter name="count" type="long"> +<parameter name="charCount" type="long"> </parameter> <exception name="IOException" type="java.io.IOException"> </exception> diff --git a/core/java/android/content/SyncAdapterType.java b/core/java/android/content/SyncAdapterType.java index 787c757..b85346e 100644 --- a/core/java/android/content/SyncAdapterType.java +++ b/core/java/android/content/SyncAdapterType.java @@ -33,7 +33,6 @@ public class SyncAdapterType implements Parcelable { private final boolean isAlwaysSyncable; private final boolean allowParallelSyncs; - /** @hide */ public SyncAdapterType(String authority, String accountType, boolean userVisible, boolean supportsUploading) { if (TextUtils.isEmpty(authority)) { |