revert an API change that conflicted witha previous SDK version (957d85ec) · Commits · e / os / android_frameworks_base

api/current.xml

+19 −3

Original line number	Original line	Diff line number	Diff line
	@@ -55478,6 +55478,22 @@
	deprecated="not deprecated"		deprecated="not deprecated"
	visibility="public"		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 name="source" type="android.os.Parcel">
	</parameter>		</parameter>
	</constructor>		</constructor>
	@@ -250590,7 +250606,7 @@
	deprecated="not deprecated"		deprecated="not deprecated"
	visibility="public"		visibility="public"
	>		>
	<parameter name="t" type="T">		<parameter name="arg0" type="T">
	</parameter>		</parameter>
	</method>		</method>
	</interface>		</interface>
	@@ -259269,7 +259285,7 @@
	deprecated="not deprecated"		deprecated="not deprecated"
	visibility="public"		visibility="public"
	>		>
	<parameter name="toSkip" type="long">		<parameter name="byteCount" type="long">
	</parameter>		</parameter>
	<exception name="IOException" type="java.io.IOException">		<exception name="IOException" type="java.io.IOException">
	</exception>		</exception>
	@@ -263827,7 +263843,7 @@
	deprecated="not deprecated"		deprecated="not deprecated"
	visibility="public"		visibility="public"
	>		>
	<parameter name="count" type="long">		<parameter name="charCount" type="long">
	</parameter>		</parameter>
	<exception name="IOException" type="java.io.IOException">		<exception name="IOException" type="java.io.IOException">
	</exception>		</exception>

core/java/android/content/SyncAdapterType.java

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -33,7 +33,6 @@ public class SyncAdapterType implements Parcelable {
	private final boolean isAlwaysSyncable;		private final boolean isAlwaysSyncable;
	private final boolean allowParallelSyncs;		private final boolean allowParallelSyncs;

	/** @hide */
	public SyncAdapterType(String authority, String accountType, boolean userVisible,		public SyncAdapterType(String authority, String accountType, boolean userVisible,
	boolean supportsUploading) {		boolean supportsUploading) {
	if (TextUtils.isEmpty(authority)) {		if (TextUtils.isEmpty(authority)) {