Merge "Update checkKeyIntent" into tm-dev (413da0f7) · Commits · e / os / android_frameworks_base

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

+6 −3

Original line number	Diff line number	Diff line
		@@ -4917,6 +4917,8 @@ public class AccountManagerService
		Log.e(TAG, String.format(tmpl, activityName, pkgName, mAccountType));
		return false;
		}
		intent.setComponent(targetActivityInfo.getComponentName());
		bundle.putParcelable(AccountManager.KEY_INTENT, intent);
		return true;
		} finally {
		Binder.restoreCallingIdentity(bid);
		@@ -4938,14 +4940,15 @@ public class AccountManagerService
		Bundle simulateBundle = p.readBundle();
		p.recycle();
		Intent intent = bundle.getParcelable(AccountManager.KEY_INTENT, Intent.class);
		if (intent != null && intent.getClass() != Intent.class) {
		return false;
		}
		Intent simulateIntent = simulateBundle.getParcelable(AccountManager.KEY_INTENT,
		Intent.class);
		if (intent == null) {
		return (simulateIntent == null);
		}
		if (intent.getClass() != Intent.class \|\| simulateIntent.getClass() != Intent.class) {
		return false;
		}

		if (!intent.filterEquals(simulateIntent)) {
		return false;
		}