From ad9a72c2ecf4e9e26fa1b47bb74c0abcbda4212d Mon Sep 17 00:00:00 2001 From: Dmitry Dementyev Date: Mon, 14 Oct 2024 19:32:02 +0000 Subject: Revert "Update checkKeyIntent" This reverts commit e8d06e714a6214a84ae4db697775dbf858e26666. Reason for revert: wrong version of the fix Change-Id: I4c5daa59db7e4dd91231ab4641590359c297e10d Merged-In: Ied7961c73299681aa5b523cf3f00fd905893116f --- .../java/com/android/server/accounts/AccountManagerService.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java index 726df6aea927..36ffc40bf5f7 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 @@ 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); @@ -4939,16 +4937,13 @@ public class AccountManagerService 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; } -- cgit v1.2.3-59-g8ed1b