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

Commit db2a7e2e authored by Sandra Kwan's avatar Sandra Kwan Committed by Android (Google) Code Review
Browse files

Merge "Allows AccountManager to start exported activities."

parents b97d4afe 0e961a13
Loading
Loading
Loading
Loading
+6 −1
Original line number Diff line number Diff line
@@ -3899,7 +3899,12 @@ public class AccountManagerService
                ResolveInfo resolveInfo = pm.resolveActivityAsUser(intent, 0, mAccounts.userId);
                ActivityInfo targetActivityInfo = resolveInfo.activityInfo;
                int targetUid = targetActivityInfo.applicationInfo.uid;
                if (PackageManager.SIGNATURE_MATCH != pm.checkSignatures(authUid, targetUid)) {
                if (!GrantCredentialsPermissionActivity.class.getName().equals(
                        targetActivityInfo.getClass().getName())
                        && !CantAddAccountActivity.class
                                .equals(targetActivityInfo.getClass().getName())
                        && PackageManager.SIGNATURE_MATCH != pm.checkSignatures(authUid,
                                targetUid)) {
                    String pkgName = targetActivityInfo.packageName;
                    String activityName = targetActivityInfo.name;
                    String tmpl = "KEY_INTENT resolved to an Activity (%s) in a package (%s) that "