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

Unverified Commit cdd85984 authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Merge tag 'android-8.1.0_r79' of... 

Merge tag 'android-8.1.0_r79' of https://android.googlesource.com/platform/packages/apps/Settings into staging/lineage-15.1_merge-android-8.1.0_r79

Android 8.1.0 Release 79 (6560352)

* tag 'android-8.1.0_r79' of https://android.googlesource.com/platform/packages/apps/Settings:
  Allows to launch only authenticator owned activities

Change-Id: Ieb6f7730c1d0ca4e349c013ed9d4066fe5a5d6eb
parents 790e1a4e cbf1f0e8

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

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

        ActivityInfo resolvedActivityInfo = resolveInfo.activityInfo;

        ApplicationInfo resolvedAppInfo = resolvedActivityInfo.applicationInfo;

        ApplicationInfo resolvedAppInfo = resolvedActivityInfo.applicationInfo;

        try {

        try {

            if (resolvedActivityInfo.exported) {

            // Allows to launch only authenticator owned activities.

                if (resolvedActivityInfo.permission == null) {

                    return true; // exported activity without permission.

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

                    authDesc.packageName) == PackageManager.PERMISSION_GRANTED) {

                    return true;

                }

            }

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

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

            return resolvedAppInfo.uid == authenticatorAppInf.uid;

            return resolvedAppInfo.uid == authenticatorAppInf.uid;

        } catch (NameNotFoundException e) {

        } catch (NameNotFoundException e) {