Merge "Move lingering services to services.jar." (16db3c72) · Commits · e / os / android_frameworks_base

core/java/android/accounts/AccountAuthenticatorResponse.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@ public class AccountAuthenticatorResponse implements Parcelable {
		/**
		* @hide
		*/
		/* package private */ AccountAuthenticatorResponse(IAccountAuthenticatorResponse response) {
		public AccountAuthenticatorResponse(IAccountAuthenticatorResponse response) {
		mAccountAuthenticatorResponse = response;
		}

+5 −1

Original line number	Diff line number	Diff line
		@@ -116,6 +116,10 @@ public abstract class ContentResolver {
		*/
		public static final String SYNC_EXTRAS_INITIALIZE = "initialize";

		/** @hide */
		public static final Intent ACTION_SYNC_CONN_STATUS_CHANGED =
		new Intent("com.android.sync.SYNC_CONN_STATUS_CHANGED");

		public static final String SCHEME_CONTENT = "content";
		public static final String SCHEME_ANDROID_RESOURCE = "android.resource";
		public static final String SCHEME_FILE = "file";
		@@ -181,7 +185,7 @@ public abstract class ContentResolver {
		};

		/** @hide */
		static String syncErrorToString(int error) {
		public static String syncErrorToString(int error) {
		if (error < 1 \|\| error > SYNC_ERROR_NAMES.length) {
		return String.valueOf(error);
		}

+20 −1

Original line number	Diff line number	Diff line
		@@ -79,6 +79,25 @@ public class PeriodicSync implements Parcelable {
		return account.equals(other.account)
		&& authority.equals(other.authority)
		&& period == other.period
		&& SyncStorageEngine.equals(extras, other.extras);
		&& syncExtrasEquals(extras, other.extras);
		}

		/** {@hide} */
		public static boolean syncExtrasEquals(Bundle b1, Bundle b2) {
		if (b1.size() != b2.size()) {
		return false;
		}
		if (b1.isEmpty()) {
		return true;
		}
		for (String key : b1.keySet()) {
		if (!b2.containsKey(key)) {
		return false;
		}
		if (!b1.get(key).equals(b2.get(key))) {
		return false;
		}
		}
		return true;
		}
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@ import java.io.IOException;
		* A cache of services that export the {@link android.content.ISyncAdapter} interface.
		* @hide
		*/
		/* package private */ class SyncAdaptersCache extends RegisteredServicesCache<SyncAdapterType> {
		public class SyncAdaptersCache extends RegisteredServicesCache<SyncAdapterType> {
		private static final String TAG = "Account";

		private static final String SERVICE_INTERFACE = "android.content.SyncAdapter";
		@@ -39,7 +39,7 @@ import java.io.IOException;
		private static final String ATTRIBUTES_NAME = "sync-adapter";
		private static final MySerializer sSerializer = new MySerializer();

		SyncAdaptersCache(Context context) {
		public SyncAdaptersCache(Context context) {
		super(context, SERVICE_INTERFACE, SERVICE_META_DATA, ATTRIBUTES_NAME, sSerializer);
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -46,7 +46,7 @@ public class SyncInfo implements Parcelable {
		public final long startTime;

		/** @hide */
		SyncInfo(int authorityId, Account account, String authority,
		public SyncInfo(int authorityId, Account account, String authority,
		long startTime) {
		this.authorityId = authorityId;
		this.account = account;