am 60b4afed: Merge "Fix account filtering for specific package name" into jb-mr2-dev (77049e13) · Commits · e / os / android_frameworks_base

services/java/com/android/server/accounts/AccountManagerService.java

+11 −4

Original line number	Diff line number	Diff line
		@@ -2802,12 +2802,19 @@ public class AccountManagerService
		if (sharedAccounts == null \|\| sharedAccounts.length == 0) return unfiltered;
		String requiredAccountType = "";
		try {
		// If there's an explicit callingPackage specified, check if that package
		// opted in to see restricted accounts.
		if (callingPackage != null) {
		PackageInfo pi = mPackageManager.getPackageInfo(callingPackage, 0);
		if (pi != null && pi.restrictedAccountType != null) {
		requiredAccountType = pi.restrictedAccountType;
		}
		} else {
		// Otherwise check if the callingUid has a package that has opted in
		for (String packageName : packages) {
		PackageInfo pi = mPackageManager.getPackageInfo(packageName, 0);
		if (pi != null && pi.restrictedAccountType != null) {
		requiredAccountType = pi.restrictedAccountType;
		// If it matches the package name of the original caller, use this choice.
		if (callingPackage != null && packageName.equals(callingPackage)) {
		break;
		}
		}