Merge "Bugfix: use the correct user for ContentResolver calls" into lmp-dev (ffb63439) · Commits · e / os / android_frameworks_base

core/java/android/content/ContentResolver.java

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -1763,7 +1763,7 @@ public abstract class ContentResolver {
	* @param extras any extras to pass to the SyncAdapter.		* @param extras any extras to pass to the SyncAdapter.
	*/		*/
	public static void requestSync(Account account, String authority, Bundle extras) {		public static void requestSync(Account account, String authority, Bundle extras) {
	requestSyncAsUser(account, authority, UserHandle.getCallingUserId(), extras);		requestSyncAsUser(account, authority, UserHandle.myUserId(), extras);
	}		}

	/**		/**
	@@ -1938,7 +1938,7 @@ public abstract class ContentResolver {
	* @param sync true if the provider should be synced when tickles are received for it		* @param sync true if the provider should be synced when tickles are received for it
	*/		*/
	public static void setSyncAutomatically(Account account, String authority, boolean sync) {		public static void setSyncAutomatically(Account account, String authority, boolean sync) {
	setSyncAutomaticallyAsUser(account, authority, sync, UserHandle.getCallingUserId());		setSyncAutomaticallyAsUser(account, authority, sync, UserHandle.myUserId());
	}		}

	/**		/**
	@@ -2165,7 +2165,7 @@ public abstract class ContentResolver {
	* @param sync the master auto-sync setting that applies to all the providers and accounts		* @param sync the master auto-sync setting that applies to all the providers and accounts
	*/		*/
	public static void setMasterSyncAutomatically(boolean sync) {		public static void setMasterSyncAutomatically(boolean sync) {
	setMasterSyncAutomaticallyAsUser(sync, UserHandle.getCallingUserId());		setMasterSyncAutomaticallyAsUser(sync, UserHandle.myUserId());
	}		}

	/**		/**
	@@ -2297,7 +2297,7 @@ public abstract class ContentResolver {
	* @return true if there is a pending sync with the matching account and authority		* @return true if there is a pending sync with the matching account and authority
	*/		*/
	public static boolean isSyncPending(Account account, String authority) {		public static boolean isSyncPending(Account account, String authority) {
	return isSyncPendingAsUser(account, authority, UserHandle.getCallingUserId());		return isSyncPendingAsUser(account, authority, UserHandle.myUserId());
	}		}

	/**		/**