Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad9a72c2 authored by Dmitry Dementyev's avatar Dmitry Dementyev
Browse files

Revert "Update checkKeyIntent" 

This reverts commit e8d06e71.

Reason for revert: wrong version of the fix

Change-Id: I4c5daa59db7e4dd91231ab4641590359c297e10d
Merged-In: Ied7961c73299681aa5b523cf3f00fd905893116f
parent e8d06e71

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

+1 −6
Original line number Diff line number Diff line
@@ -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;

            }