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

Commit 79f22d2b authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [11816540, 11816001, 11816620, 11816559, 11816541,... 

Merge cherrypicks of [11816540, 11816001, 11816620, 11816559, 11816541, 11816621, 11815640, 11816506, 11816507, 11816508, 11816586, 11816587, 11816588, 11816589, 11816520, 11816173, 11816590, 11816591, 11816395, 11816003, 11816698, 11815507] into qt-qpr3-release

Change-Id: I398e0d1f652bafc92f99b05d665cf1f9018cc6fa
parents 433e9902 33dd3187

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