Merge "Add more checkKeyIntent checks to AccountManagerService." into sc-dev (649ff85e) · Commits · e / os / android_frameworks_base

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

+10 −0

Original line number	Diff line number	Diff line
		@@ -3558,6 +3558,11 @@ public class AccountManagerService

		// Strip auth token from result.
		result.remove(AccountManager.KEY_AUTHTOKEN);
		if (!checkKeyIntent(Binder.getCallingUid(), result)) {
		onError(AccountManager.ERROR_CODE_INVALID_RESPONSE,
		"invalid intent in bundle returned");
		return;
		}

		if (Log.isLoggable(TAG, Log.VERBOSE)) {
		Log.v(TAG,
		@@ -5135,6 +5140,11 @@ public class AccountManagerService
		} else {
		if (mStripAuthTokenFromResult) {
		result.remove(AccountManager.KEY_AUTHTOKEN);
		if (!checkKeyIntent(Binder.getCallingUid(), result)) {
		onError(AccountManager.ERROR_CODE_INVALID_RESPONSE,
		"invalid intent in bundle returned");
		return;
		}
		}
		if (Log.isLoggable(TAG, Log.VERBOSE)) {
		Log.v(TAG, getClass().getSimpleName()