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

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

Merge tag 'android-9.0.0_r59' of... 

Merge tag 'android-9.0.0_r59' of https://android.googlesource.com/platform/packages/apps/Settings into staging/lineage-16.0_merge-android-9.0.0_r59

Android 9.0.0 Release 59 (6559974)

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

Change-Id: I99ddbc509f973ad139d7798b561408e613d56c41
parents 141a3566 d2babd61

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

+1 −8
Original line number Diff line number Diff line
@@ -196,14 +196,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) {