Merge "Revert "Update checkKeyIntent"" into sc-dev am: 2c0bd83b8a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/29857526
Change-Id: Ib62795c07497a72db46cd2d71c88cc425da4d45a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java
index 726df6a..36ffc40 100644
--- a/services/core/java/com/android/server/accounts/AccountManagerService.java
+++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
@@ -4916,8 +4916,6 @@
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);
@@ -4939,16 +4937,13 @@
Bundle simulateBundle = p.readBundle();
p.recycle();
Intent intent = bundle.getParcelable(AccountManager.KEY_INTENT);
- if (intent != null) {
+ if (intent != null && intent.getClass() != Intent.class) {
return false;
}
Intent simulateIntent = simulateBundle.getParcelable(AccountManager.KEY_INTENT);
if (intent == null) {
return (simulateIntent == null);
}
- if (intent.getClass() != Intent.class || simulateIntent.getClass() != Intent.class) {
- return false;
- }
if (!intent.filterEquals(simulateIntent)) {
return false;
}