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

Commit dcaeff56 authored by Xin Li's avatar Xin Li Committed by Automerger Merge Worker
Browse files

Merge "Merge QQ3A.200805.001" am: cded3298 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1388671

Change-Id: I36aaf8b9f26c71377d1c6c64396e2eb5cb2114bb
parents f257197d cded3298

src/com/android/settings/accounts/AccountTypePreferenceLoader.java

+1 −8
Original line number Diff line number Diff line
@@ -197,14 +197,7 @@ public class AccountTypePreferenceLoader { 
        ActivityInfo resolvedActivityInfo = resolveInfo.activityInfo;

        ApplicationInfo resolvedAppInfo = resolvedActivityInfo.applicationInfo;

        try {

            if (resolvedActivityInfo.exported) {

                if (resolvedActivityInfo.permission == null) {

                    return true; // exported activity without permission.

                } else if (pm.checkPermission(resolvedActivityInfo.permission,

                    authDesc.packageName) == PackageManager.PERMISSION_GRANTED) {

                    return true;

                }

            }

            // Allows to launch only authenticator owned activities.

            ApplicationInfo authenticatorAppInf = pm.getApplicationInfo(authDesc.packageName, 0);

            return resolvedAppInfo.uid == authenticatorAppInf.uid;

        } catch (NameNotFoundException e) {