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

Commit d2b2a4e1 authored by Xin Li's avatar Xin Li
Browse files

Merge QQ3A.200805.001 

Bug: 162879794
Merged-In: I398e0d1f652bafc92f99b05d665cf1f9018cc6fa
Change-Id: I1129dba865eb6acaa047bc43e3057d02d8528ff0
parents 9057a78b 79f22d2b

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) {