Merge tag 'android-6.0.1_r24' into HEAD (12a8ab90) · Commits · e / os / android_frameworks_base

core/java/android/content/SyncInfo.java

+18 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,13 @@ import android.os.Parcelable;
		* Information about the sync operation that is currently underway.
		*/
		public class SyncInfo implements Parcelable {
		/**
		* Used when the caller receiving this object doesn't have permission to access the accounts
		* on device.
		* @See Manifest.permission.GET_ACCOUNTS
		*/
		private static final Account REDACTED_ACCOUNT = new Account("***", "***");

		/** @hide */
		public final int authorityId;

		@@ -44,6 +51,17 @@ public class SyncInfo implements Parcelable {
		*/
		public final long startTime;

		/**
		* Creates a SyncInfo object with an unusable Account. Used when the caller receiving this
		* object doesn't have access to the accounts on the device.
		* @See Manifest.permission.GET_ACCOUNTS
		* @hide
		*/
		public static SyncInfo createAccountRedacted(
		int authorityId, String authority, long startTime) {
		return new SyncInfo(authorityId, REDACTED_ACCOUNT, authority, startTime);
		}

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

services/core/java/com/android/server/content/ContentService.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -815,9 +815,13 @@ public final class ContentService extends IContentService.Stub {
		mContext.enforceCallingOrSelfPermission(Manifest.permission.READ_SYNC_STATS,
		"no permission to read the sync stats");

		final boolean canAccessAccounts =
		mContext.checkCallingOrSelfPermission(Manifest.permission.GET_ACCOUNTS)
		== PackageManager.PERMISSION_GRANTED;
		long identityToken = clearCallingIdentity();
		try {
		return getSyncManager().getSyncStorageEngine().getCurrentSyncsCopy(userId);
		return getSyncManager().getSyncStorageEngine()
		.getCurrentSyncsCopy(userId, canAccessAccounts);
		} finally {
		restoreCallingIdentity(identityToken);
		}

services/core/java/com/android/server/content/SyncStorageEngine.java

+20 −6

Original line number	Diff line number	Diff line
		@@ -45,6 +45,7 @@ import android.util.Pair;
		import android.util.SparseArray;
		import android.util.ArrayMap;
		import android.util.Xml;
		import android.util.EventLog;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.util.ArrayUtils;
		@@ -1458,15 +1459,23 @@ public class SyncStorageEngine extends Handler {
		}

		/**
		* @return a copy of the current syncs data structure. Will not return
		* null.
		* @param userId Id of user to return current sync info.
		* @param canAccessAccounts Determines whether to redact Account information from the result.
		* @return a copy of the current syncs data structure. Will not return null.
		*/
		public List<SyncInfo> getCurrentSyncsCopy(int userId) {
		public List<SyncInfo> getCurrentSyncsCopy(int userId, boolean canAccessAccounts) {
		synchronized (mAuthorities) {
		final List<SyncInfo> syncs = getCurrentSyncsLocked(userId);
		final List<SyncInfo> syncsCopy = new ArrayList<SyncInfo>();
		for (SyncInfo sync : syncs) {
		syncsCopy.add(new SyncInfo(sync));
		SyncInfo copy;
		if (!canAccessAccounts) {
		copy = SyncInfo.createAccountRedacted(
		sync.authorityId, sync.authority, sync.startTime);
		} else {
		copy = new SyncInfo(sync);
		}
		syncsCopy.add(copy);
		}
		return syncsCopy;
		}
		@@ -1892,9 +1901,14 @@ public class SyncStorageEngine extends Handler {
		if ("authority".equals(tagName)) {
		authority = parseAuthority(parser, version);
		periodicSync = null;
		if (authority != null) {
		if (authority.ident > highestAuthorityId) {
		highestAuthorityId = authority.ident;
		}
		} else {
		EventLog.writeEvent(0x534e4554, "26513719", -1,
		"Malformed authority");
		}
		} else if (XML_TAG_LISTEN_FOR_TICKLES.equals(tagName)) {
		parseListenForTickles(parser);
		}